From 851c73b3e47b4b64639f4d825b00d069330059e3 Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Sun, 1 May 2016 17:49:37 +0200
Subject: Core/Scripting: Kill pending unit events when swapping AI's

---
 src/server/game/Scripting/ScriptMgr.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index ca1cd71363e..ac440da3f24 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -368,6 +368,8 @@ class CreatureGameObjectScriptRegistrySwapHooks
     // Hook which is called before a creature is swapped
     static void UnloadStage1(Creature* creature)
     {
+        creature->m_Events.KillAllEvents(true);
+
         if (creature->IsCharmed())
             creature->RemoveCharmedBy(nullptr);
 
-- 
cgit v1.2.3