diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index a69ebe9212e..2d57d1472b4 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -665,13 +665,15 @@ void AuraEffect::HandleEffect(AuraApplication * aurApp, uint8 mode, bool apply) else prevented = GetBase()->CallScriptEffectRemoveHandlers(this, aurApp, (AuraEffectHandleModes)mode); - // check if script events have removed the aura or if default effect prevention was requested - if ((apply && aurApp->GetRemoveMode()) || prevented) + // check if script events have removed the aura already + if (apply && aurApp->GetRemoveMode()) return; - (*this.*AuraEffectHandler[GetAuraType()])(aurApp, mode, apply); + // call default effect handler if it wasn't prevented + if (!prevented) + (*this.*AuraEffectHandler[GetAuraType()])(aurApp, mode, apply); - // check if script events have removed the aura or if default effect prevention was requested + // check if the default handler reemoved the aura if (apply && aurApp->GetRemoveMode()) return; |