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:50:34 +0200 |
| commit | 8bf3d181b6a4fc233f8a1ded8275d958203aace1 (patch) | |
| tree | b28fed6276dd8a4a260d099aaa0aa2a58bfc2eb1 /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | c28e6a8c160fd5f190ddfc19a60e2a34df9a19ef (diff) | |
Core/Scripting: Kill pending unit events when swapping AI's
(cherry picked from commit 851c73b3e47b4b64639f4d825b00d069330059e3)
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 322facbce25..5d3297b009d 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); |