aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-02 02:48:02 -0300
committerjoschiwald <joschiwald.trinity@gmail.com>2017-03-04 20:19:09 +0100
commit4c0bed828370efb45f02cc37944acc3389bd45fa (patch)
tree1b93299e4d95e20ce691096110e321da372e979c
parent3ce3acf765c413a307e821cb9c264f93b363ff94 (diff)
Core/Spells: SPELL_AURA_SCHOOL_IMMUNITY auras shouldn't remove passive auras (even if negative)
Ref issue #6375 (cherry picked from commit b2fbd2c75df72034cc613b1a0054916f454f16ce)
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 7f04f8ad0a9..705f688db60 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -3438,6 +3438,7 @@ void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const* aurApp, uint
return (spell->GetSchoolMask() & schoolMask) // Check for school mask
&& GetSpellInfo()->CanDispelAura(spell)
&& !aurApp->IsPositive() // Don't remove positive spells
+ && !spell->IsPassive() // Don't remove passive auras
&& spell->Id != GetId(); // Don't remove self
});
}