diff options
| author | Trisjdc <trisjdc@gmail.com> | 2014-06-22 09:07:11 +0100 |
|---|---|---|
| committer | Trisjdc <trisjdc@gmail.com> | 2014-06-22 09:07:11 +0100 |
| commit | ddc8c35d1b1c4783380dae4ff49da6f301fe145f (patch) | |
| tree | 9636a84fe3ae8da2f4133cca8a3e18fe546524f6 /src | |
| parent | 516246cbe9d8f9f6b8add91d56ffae6848327f4f (diff) | |
| parent | e1498f25ae0813f98dcc6050e5c3179408bffc90 (diff) | |
Merge pull request #11750 from gecko32/upstream_master
core/spells: Cyclone & Farie Fire Piercing Cyclone
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index ba4c3deca85..4d97dc97e5b 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1207,10 +1207,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; |