aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsirikfoll <sirikfoll@hotmail.com>2017-01-13 14:24:26 -0300
committerShauren <shauren.trinity@gmail.com>2018-12-09 14:18:42 +0100
commite64cd5669dc3b46ad9013cba25b81e46ef98c624 (patch)
tree06666a0d66924e268990f4d5a9195950297ad40c
parentf2950f851e54eeb3bb1070e2d5393e7d2acbff53 (diff)
Core/Scripting: Fixed hotswap calling evade mode for dead creatures
(cherry-picked from afa8527338f8d07531cf2cf8a59195321dfb257e)
-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 2367e26218c..c7e87633db0 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -402,7 +402,8 @@ class CreatureGameObjectAreaTriggerScriptRegistrySwapHooks
ASSERT(!creature->IsCharmed(),
"There is a disabled AI which is still loaded.");
- creature->AI()->EnterEvadeMode();
+ if (creature->IsAlive())
+ creature->AI()->EnterEvadeMode();
}
static void UnloadDestroyScript(Creature* creature)