aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptMgr.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-02-05 20:52:19 +0100
committerShauren <shauren.trinity@gmail.com>2018-02-05 20:52:19 +0100
commit2fd9dc2edb0355d15f5afd21cc6aa61d172d19cc (patch)
treed0c387387bc862ff1fd379a4056560f5626ed608 /src/server/game/Scripting/ScriptMgr.cpp
parented931cfa1963565e989cd99565fd360b1ab6ce55 (diff)
Core/Scripts: Fixed ENSURE_AI assertion failures when used in Reset()/InitializeAI() hooks with hotswap
Updates #20727
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 2b8acfa67d1..cbee458c9a0 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -421,7 +421,7 @@ class CreatureGameObjectScriptRegistrySwapHooks
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;
@@ -432,6 +432,7 @@ class CreatureGameObjectScriptRegistrySwapHooks
if (!creature->IsAlive())
return;
+ creature->AI_InitializeAndEnable();
creature->AI()->EnterEvadeMode();
// Cast a dummy visual spell asynchronously here to signal