From 756e8aa6a90a6f68f36a84da5fc271c358f74652 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 12 May 2020 23:49:17 -0400 Subject: [PATCH] Core/Unit: fix SPELL_AURA_MOD_DAMAGE_DONE damage calculation on non-melee schools Port From (https://github.com/TrinityCore/TrinityCore/commit/8889b6f54c803805fe28ca9e015efe064759262a) --- Source/Game/Entities/Unit/Unit.Combat.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index d62e6bd72..27da6da11 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -3266,7 +3266,14 @@ namespace Game.Entities _ => throw new NotImplementedException(), }; - float amount = GetTotalAuraModifier(AuraType.ModDamageDone, auratype => CheckAttackFitToAuraRequirement(attackType, auratype)); + float amount = GetTotalAuraModifier(AuraType.ModDamageDone, aurEff => + { + if ((aurEff.GetMiscValue() & (int)SpellSchoolMask.Normal) == 0) + return false; + + return CheckAttackFitToAuraRequirement(attackType, aurEff); + }); + SetStatFlatModifier(unitMod, UnitModifierFlatType.Total, amount); }