From 5ad31dcf5558586b3c20bff541bd25d028ba7e89 Mon Sep 17 00:00:00 2001 From: ariel- Date: Thu, 20 Apr 2017 02:12:15 -0300 Subject: [PATCH] Core/Unit: fix SPELL_AURA_MOD_DAMAGE_DONE damage calculation on non-melee schools for Keader :P (cherry picked from commit 66ac1509ae925edc8848cdf6c370f8ed52c688ec) --- src/server/game/Entities/Unit/Unit.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 85cf04be15..86743e615f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9834,7 +9834,13 @@ void Unit::UpdateDamageDoneMods(WeaponAttackType attackType) break; } - float amount = GetTotalAuraModifier(SPELL_AURA_MOD_DAMAGE_DONE, std::bind(&Unit::CheckAttackFitToAuraRequirement, this, attackType, std::placeholders::_1)); + float amount = GetTotalAuraModifier(SPELL_AURA_MOD_DAMAGE_DONE, [&](AuraEffect const* aurEff) -> bool + { + if (!(aurEff->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) + return false; + + return CheckAttackFitToAuraRequirement(attackType, aurEff); + }); SetStatFlatModifier(unitMod, TOTAL_VALUE, amount); }