From e2d7dc9bd7fc636469e46b82587a92f43e7825d9 Mon Sep 17 00:00:00 2001 From: acidmanifesto Date: Wed, 9 Mar 2022 18:16:52 -0500 Subject: [PATCH] fix (core): Load Order Adjustment GAME_EVENT_START hook (#10939) This effect any and all Smartscripts using Smart Event 68 (10 total at this time of rev) and 69 (21 total at this time of rev) Dealing both with event 85 Stitches Event and event 87 Scarlet Oracle --- src/server/game/Events/GameEventMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index fa574f278..2902bb661 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1235,9 +1235,6 @@ void GameEventMgr::ApplyNewEvent(uint16 event_id) LOG_DEBUG("gameevent", "GameEvent {} \"{}\" started.", event_id, mGameEvent[event_id].description); - //! Run SAI scripts with SMART_EVENT_GAME_EVENT_END - RunSmartAIScripts(event_id, true); - // spawn positive event tagget objects GameEventSpawn(event_id); // un-spawn negative event tagged objects @@ -1255,6 +1252,9 @@ void GameEventMgr::ApplyNewEvent(uint16 event_id) // update bg holiday UpdateBattlegroundSettings(); + //! Run SAI scripts with SMART_EVENT_GAME_EVENT_START + RunSmartAIScripts(event_id, true); + // If event's worldstate is 0, it means the event hasn't been started yet. In that case, reset seasonal quests. // When event ends (if it expires or if it's stopped via commands) worldstate will be set to 0 again, ready for another seasonal quest reset. if (sWorld->getWorldState(event_id) == 0)