From 5c86b2aa3648f113145f1b2e299f7cd0b1bd86c9 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Sun, 7 May 2017 20:37:19 +0200 Subject: [PATCH] Core/SpellScripts: SPELL_SCRIPT_HOOK_EFFECT_SUCCESSFUL_DISPEL is a TargetHook and a EffectHook --- src/server/game/Spells/SpellScript.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 16074c1534d..eb4c6691ee3 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -403,6 +403,7 @@ bool SpellScript::IsInTargetHook() const { case SPELL_SCRIPT_HOOK_EFFECT_LAUNCH_TARGET: case SPELL_SCRIPT_HOOK_EFFECT_HIT_TARGET: + case SPELL_SCRIPT_HOOK_EFFECT_SUCCESSFUL_DISPEL: case SPELL_SCRIPT_HOOK_BEFORE_HIT: case SPELL_SCRIPT_HOOK_HIT: case SPELL_SCRIPT_HOOK_AFTER_HIT: @@ -417,7 +418,8 @@ bool SpellScript::IsInHitPhase() const bool SpellScript::IsInEffectHook() const { - return (m_currentScriptState >= SPELL_SCRIPT_HOOK_EFFECT_LAUNCH && m_currentScriptState <= SPELL_SCRIPT_HOOK_EFFECT_HIT_TARGET); + return (m_currentScriptState >= SPELL_SCRIPT_HOOK_EFFECT_LAUNCH && m_currentScriptState <= SPELL_SCRIPT_HOOK_EFFECT_HIT_TARGET) + || m_currentScriptState == SPELL_SCRIPT_HOOK_EFFECT_SUCCESSFUL_DISPEL; } Unit* SpellScript::GetCaster() const