diff options
| author | Naios <naios-dev@live.de> | 2016-05-01 17:49:37 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-05-01 17:49:37 +0200 |
| commit | 851c73b3e47b4b64639f4d825b00d069330059e3 (patch) | |
| tree | 1c7302f3ba650e40d1dd9e1b33cbc94342cfaee9 /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | 1aa30d3cce8a2003ad7873410fe9ec09ff357dcf (diff) | |
Core/Scripting: Kill pending unit events when swapping AI's
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); |