From e64cd5669dc3b46ad9013cba25b81e46ef98c624 Mon Sep 17 00:00:00 2001
From: sirikfoll <sirikfoll@hotmail.com>
Date: Fri, 13 Jan 2017 14:24:26 -0300
Subject: Core/Scripting: Fixed hotswap calling evade mode for dead creatures

(cherry-picked from afa8527338f8d07531cf2cf8a59195321dfb257e)
---
 src/server/game/Scripting/ScriptMgr.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/server/game/Scripting/ScriptMgr.cpp')

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)
-- 
cgit v1.2.3