aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGecko32 <Gecko3262@gmail.com>2014-03-19 09:52:57 -0400
committerGecko32 <Gecko3262@gmail.com>2014-03-19 12:41:55 -0400
commite1498f25ae0813f98dcc6050e5c3179408bffc90 (patch)
tree395d8c99f6a258730778310189ef86c00d17f29c /src
parent38611a6d19e1167730ba2661ff4749e273a44473 (diff)
Make Cyclone and faerie fire unable to pierce cyclone and banish
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellInfo.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 21c36510a32..f30dc815371 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -1206,10 +1206,8 @@ bool SpellInfo::CanPierceImmuneAura(SpellInfo const* aura) const
if (Attributes & SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY)
return true;
- // these spells (Cyclone for example) can pierce all...
- if ((AttributesEx & SPELL_ATTR1_UNAFFECTED_BY_SCHOOL_IMMUNE)
- // ...but not these (Divine shield for example)
- && !(aura && (aura->Mechanic == MECHANIC_IMMUNE_SHIELD || aura->Mechanic == MECHANIC_INVULNERABILITY)))
+ // these spells (Cyclone for example) can pierce all... // ...but not these (Divine shield, Ice block, Cyclone and Banish for example)
+ if ((AttributesEx & SPELL_ATTR1_UNAFFECTED_BY_SCHOOL_IMMUNE) && !(aura && (aura->Mechanic == MECHANIC_IMMUNE_SHIELD || aura->Mechanic == MECHANIC_INVULNERABILITY || aura->Mechanic == MECHANIC_BANISH)))
return true;
return false;