aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-04-20 02:12:15 -0300
committerfunjoker <funjoker109@gmail.com>2020-04-27 14:58:52 +0200
commit8889b6f54c803805fe28ca9e015efe064759262a (patch)
tree175eb5f0f81af60ea685e6b12f01f9d8f58fb2b2 /src
parent71c2fda1132d5fba3864f133d0e3ee4e81de508f (diff)
Core/Unit: fix SPELL_AURA_MOD_DAMAGE_DONE damage calculation on non-melee schools
for Keader :P (cherry picked from commit 66ac1509ae925edc8848cdf6c370f8ed52c688ec)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index c1ba570d498..2c8cf177669 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9579,7 +9579,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);
}