diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-02-05 20:52:19 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-02-05 23:41:39 +0100 |
| commit | 8ed52e9dc36d238c28ba292afda2f58710b96e8b (patch) | |
| tree | 357a3ee6eda5917033cdc868050db275909a0339 /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | 4e373426aa2320fabcbc9843a804ccc71b40794a (diff) | |
Core/Scripts: Fixed ENSURE_AI assertion failures when used in Reset()/InitializeAI() hooks with hotswap
Updates #20727
(cherry picked from commit 2fd9dc2edb0355d15f5afd21cc6aa61d172d19cc)
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index f8ef25e7b57..2367e26218c 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -453,7 +453,7 @@ class CreatureGameObjectAreaTriggerScriptRegistrySwapHooks if (creature->IsAlive()) creature->ClearUnitState(UNIT_STATE_EVADE); - bool const created = creature->AIM_Initialize(); + bool const created = creature->AIM_Create(); ASSERT(created, "Creating the AI should never fail here!"); (void)created; @@ -464,6 +464,7 @@ class CreatureGameObjectAreaTriggerScriptRegistrySwapHooks if (!creature->IsAlive()) return; + creature->AI_InitializeAndEnable(); creature->AI()->EnterEvadeMode(); // Cast a dummy visual spell asynchronously here to signal |