Core/Spells: merged damage calculation spell mod order fix for weapon damage

This commit is contained in:
Ovahlord authored and Aokromes committed 2018-08-29 23:13:13 +02:00
1 parent e1b291491b
commit 0c555e61d8
2 files changed
+11 -12

No files matched your search

-5
View File
@@ -7812,11 +7812,6 @@ uint32 Unit::MeleeDamageBonusDone(Unit* victim, uint32 pdamage, WeaponAttackType
float tmpDamage = float(int32(pdamage) + DoneFlatBenefit) * DoneTotalMod;
// apply spellmod to Done damage
if (spellProto)
if (Player* modOwner = GetSpellModOwner())
modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, tmpDamage);
// bonus result can be negative
return uint32(std::max(tmpDamage, 0.0f));
}