aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-12-15 10:01:34 -0300
committerDoctorKraft <DoctorKraft@users.noreply.github.com>2018-03-12 16:39:43 +0100
commitb80600f88adeccaa344a0a997bf95251c3024429 (patch)
tree562268abdbd291f701e4a4f23f01ed54d0d6fdb2
parentc29e25edfaa8ab02a5396ce047f75141d572f5f2 (diff)
Core/Spell: add an exception for Cyclone ignoring it's own immunity using dispel type
- Unsure of what is the correct check, most generic thing I could make Closes #18479 (cherry picked from commit 452ef146f41a9bf06ca2bfb8dc9f26ca20b4fb83)
-rw-r--r--src/server/game/Spells/SpellInfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 9d51d735e38..4e6311ec0bf 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -1622,7 +1622,7 @@ bool SpellInfo::CanPierceImmuneAura(SpellInfo const* auraSpellInfo) const
if (!auraSpellInfo ||
(auraSpellInfo->Mechanic != MECHANIC_IMMUNE_SHIELD &&
auraSpellInfo->Mechanic != MECHANIC_INVULNERABILITY &&
- (auraSpellInfo->Mechanic != MECHANIC_BANISH || IsRankOf(auraSpellInfo)))) // Banish shouldn't be immune to itself
+ (auraSpellInfo->Mechanic != MECHANIC_BANISH || (IsRankOf(auraSpellInfo) && auraSpellInfo->Dispel != DISPEL_NONE)))) // Banish shouldn't be immune to itself, but Cyclone should
return true;
}