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

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

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index ff6c6b06445..106975283a7 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);