aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellScript.cpp
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2017-05-07 20:37:19 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-05-07 20:39:51 +0200
commit5c86b2aa3648f113145f1b2e299f7cd0b1bd86c9 (patch)
tree610e8943dd63df6bb281a565d1970584cf404a23 /src/server/game/Spells/SpellScript.cpp
parent118a0afbfaaa72570ea9cf3429d9ba43d885e023 (diff)
Core/SpellScripts: SPELL_SCRIPT_HOOK_EFFECT_SUCCESSFUL_DISPEL is a TargetHook and a EffectHook
Diffstat (limited to 'src/server/game/Spells/SpellScript.cpp')
-rw-r--r--src/server/game/Spells/SpellScript.cpp4
1 files changed, 3 insertions, 1 deletions
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