From 3208b7ae1f11586c3a432e792cf6d83dfbee4f46 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 4 Jan 2011 22:41:44 +0100 Subject: Core/Auras: Prevent phase aura handler from incorrectly being stopped on aura removal Closes #32 --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index ffb5d162e89..511dcbb2d41 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2946,9 +2946,6 @@ void AuraEffect::HandlePhase(AuraApplication const * aurApp, uint8 mode, bool ap for (Unit::AuraEffectList::const_iterator itr = phases.begin(); itr != phases.end(); ++itr) newPhase |= (*itr)->GetMiscValue(); - if (apply) - newPhase |= GetMiscValue(); - // phase auras normally not expected at BG but anyway better check if (Player* player = target->ToPlayer()) { @@ -2961,7 +2958,7 @@ void AuraEffect::HandlePhase(AuraApplication const * aurApp, uint8 mode, bool ap bg->EventPlayerDroppedFlag(player); // stop handling the effect if it was removed by linked event - if (aurApp->GetRemoveMode()) + if (apply && aurApp->GetRemoveMode()) return; // GM-mode have mask 0xFFFFFFFF -- cgit v1.2.3