diff options
| author | Naios <naios-dev@live.de> | 2016-07-02 18:38:24 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-07-03 00:14:22 +0200 |
| commit | d68316fcd2fc71343edfbd387249b75bd6e8a90f (patch) | |
| tree | 6ce3e97e61e8d5730f7f07ed54a03709d06f6e95 /src | |
| parent | fad58ad099c967a17d68954b240b4f6620263366 (diff) | |
Core/Scripting: Don't force event cancellation when swapping creatures.
* EventProcessor::KillAllEvents(force = false) should only be used
by the EventProcessor.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index ac440da3f24..11ebceb08ff 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -368,7 +368,9 @@ class CreatureGameObjectScriptRegistrySwapHooks // Hook which is called before a creature is swapped static void UnloadStage1(Creature* creature) { - creature->m_Events.KillAllEvents(true); + // Remove deletable events only, + // otherwise it causes crashes with non-deletable spell events. + creature->m_Events.KillAllEvents(false); if (creature->IsCharmed()) creature->RemoveCharmedBy(nullptr); |