From ab866ca9859851af67336b1be2c574d539e303ff Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 19 Jun 2025 22:47:45 +0200 Subject: [PATCH] Core/Units: dealing melee damage will now generate rage based on armor reduced damage instead of the original value --- src/server/game/Entities/Unit/Unit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7907d3af5a..aafa68c104 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1214,15 +1214,15 @@ void Unit::CalculateMeleeDamage(Unit* victim, CalcDamageInfo* damageInfo, Weapon // Script Hook For CalculateMeleeDamage -- Allow scripts to change the Damage pre class mitigation calculations sScriptMgr->ModifyMeleeDamage(damageInfo->Target, damageInfo->Attacker, damage); - // Store unmitigated damage to reward rage later - damageInfo->UnmitigatedDamage = damage; - // Calculate armor reduction if (Unit::IsDamageReducedByArmor((SpellSchoolMask)(damageInfo->DamageSchoolMask))) damageInfo->Damage = Unit::CalcArmorReducedDamage(damageInfo->Attacker, damageInfo->Target, damage, nullptr, damageInfo->AttackType); else damageInfo->Damage = damage; + // Store unmitigated damage to reward rage later + damageInfo->UnmitigatedDamage = damage; + damageInfo->HitOutCome = RollMeleeOutcomeAgainst(damageInfo->Target, damageInfo->AttackType); switch (damageInfo->HitOutCome)