Misc cleanups/DB updates

Port From (https://github.com/TrinityCore/TrinityCore)
This commit is contained in:
hondacrx
2020-08-22 16:24:59 -04:00
parent 4d8e6a8a57
commit 8fc9c45d50
14 changed files with 84 additions and 6 deletions
+3 -4
View File
@@ -654,10 +654,9 @@ namespace Game.Spells
if (HasAttribute(SpellAttr1.UnaffectedBySchoolImmune) || HasAttribute(SpellAttr2.UnaffectedByAuraSchoolImmune))
{
// ...but not these (Divine shield, Ice block, Cyclone and Banish for example)
if (auraSpellInfo == null ||
(auraSpellInfo.Mechanic != Mechanics.ImmuneShield &&
auraSpellInfo.Mechanic != Mechanics.Invulnerability &&
(auraSpellInfo.Mechanic != Mechanics.Banish || (IsRankOf(auraSpellInfo) && auraSpellInfo.Dispel != DispelType.None)))) // Banish shouldn't be immune to itself, but Cyclone should
if (auraSpellInfo.Mechanic != Mechanics.ImmuneShield &&
auraSpellInfo.Mechanic != Mechanics.Invulnerability &&
(auraSpellInfo.Mechanic != Mechanics.Banish || (IsRankOf(auraSpellInfo) && auraSpellInfo.Dispel != DispelType.None))) // Banish shouldn't be immune to itself, but Cyclone should
return true;
}