diff --git a/src/game/WorldHandlers/GameEventMgr.cpp b/src/game/WorldHandlers/GameEventMgr.cpp index ab6eaee6..46f5e776 100644 --- a/src/game/WorldHandlers/GameEventMgr.cpp +++ b/src/game/WorldHandlers/GameEventMgr.cpp @@ -34,6 +34,7 @@ #include "BattleGround/BattleGroundMgr.h" #include "MassMailMgr.h" #include "Policies/Singleton.h" +#include "LuaEngine.h" INSTANTIATE_SINGLETON_1(GameEventMgr); @@ -82,6 +83,8 @@ void GameEventMgr::StartEvent(uint16 event_id, bool overwrite /*=false*/, bool r if (mGameEvent[event_id].end <= mGameEvent[event_id].start) { mGameEvent[event_id].end = mGameEvent[event_id].start + mGameEvent[event_id].length; } } + if (IsActiveEvent(event_id)) + sEluna->OnGameEventStart(event_id); } void GameEventMgr::StopEvent(uint16 event_id, bool overwrite) @@ -93,6 +96,8 @@ void GameEventMgr::StopEvent(uint16 event_id, bool overwrite) if (mGameEvent[event_id].end <= mGameEvent[event_id].start) { mGameEvent[event_id].end = mGameEvent[event_id].start + mGameEvent[event_id].length; } } + if (!IsActiveEvent(event_id)) + sEluna->OnGameEventStop(event_id); } void GameEventMgr::LoadFromDB() diff --git a/src/modules/Eluna b/src/modules/Eluna index 00eef91a..cd5a5552 160000 --- a/src/modules/Eluna +++ b/src/modules/Eluna @@ -1 +1 @@ -Subproject commit 00eef91aa2acd95719a18c6c6b1bb03d8b4919fe +Subproject commit cd5a55522574b9d74f7abb32cd8512b1d4234753