From fa378dc870c711ca21a9fd769765dc9ec3f0fa63 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 5 Jan 2022 13:11:58 +0100 Subject: [PATCH] Core/Spells: Unit::MeleeDamageBonusTaken will now use the SchoolMask of melee attack spells when spellInfo is provided ref https://github.com/TrinityCore/TrinityCore/issues/27523 --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index dee8759d4c..526e82a711 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8040,7 +8040,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackT int32 TakenFlatBenefit = 0; - uint32 meleeDamageSchoolMask = attacker->GetMeleeDamageSchoolMask(); + uint32 meleeDamageSchoolMask = spellProto ? spellProto->SchoolMask : attacker->GetMeleeDamageSchoolMask(); // ..taken TakenFlatBenefit += GetTotalAuraModifier(SPELL_AURA_MOD_DAMAGE_TAKEN, [meleeDamageSchoolMask, spellProto](AuraEffect const* aurEff)