From afa8527338f8d07531cf2cf8a59195321dfb257e Mon Sep 17 00:00:00 2001 From: sirikfoll Date: Fri, 13 Jan 2017 14:24:26 -0300 Subject: [PATCH] Core/Scripting: Fixed hotswap calling evade mode for dead creatures --- src/server/game/Scripting/ScriptMgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index f0c373bf1ed..621580a689b 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -378,7 +378,8 @@ class CreatureGameObjectScriptRegistrySwapHooks 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)