Core/Spell: spells with ignore hit result should pierce damage immunities

This commit is contained in:
hondacrx
2018-01-13 12:44:27 -05:00
parent 60aa0712ed
commit 14d6a9ff69
+4 -4
View File
@@ -83,10 +83,7 @@ namespace Game.Entities
} }
} }
// ... and attack power // ... and attack power
var mDamageDonebyAP = GetAuraEffectsByType(AuraType.ModSpellDamageOfAttackPower); DoneAdvertisedBenefit += (int)MathFunctions.CalculatePct(GetTotalAttackPowerValue(WeaponAttackType.BaseAttack), GetTotalAuraModifierByMiscMask(AuraType.ModSpellDamageOfAttackPower, (int)schoolMask));
foreach (var eff in mDamageDonebyAP)
if (Convert.ToBoolean(eff.GetMiscValue() & (int)schoolMask))
DoneAdvertisedBenefit += (int)MathFunctions.CalculatePct(GetTotalAttackPowerValue(WeaponAttackType.BaseAttack), eff.GetAmount());
} }
return DoneAdvertisedBenefit; return DoneAdvertisedBenefit;
@@ -1697,6 +1694,9 @@ namespace Game.Entities
if (spellInfo == null) if (spellInfo == null)
return false; return false;
if (spellInfo.HasAttribute(SpellAttr3.IgnoreHitResult))
return false;
if (spellInfo.HasAttribute(SpellAttr1.UnaffectedBySchoolImmune) || spellInfo.HasAttribute(SpellAttr2.UnaffectedByAuraSchoolImmune)) if (spellInfo.HasAttribute(SpellAttr1.UnaffectedBySchoolImmune) || spellInfo.HasAttribute(SpellAttr2.UnaffectedByAuraSchoolImmune))
return false; return false;