From bae7d15bb9f2977657ad1359bddd9bb07e9005c3 Mon Sep 17 00:00:00 2001 From: laise Date: Sat, 13 Mar 2010 21:47:42 +0300 Subject: [PATCH] [9581] Fixed apply damage reduction to melee/ranged damage. Signed-off-by: VladimirMangos --- src/game/Unit.cpp | 9 ++++++--- src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 0a30ac607..fbcf302a7 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1558,11 +1558,14 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da // only from players if (GetTypeId() == TYPEID_PLAYER) { - uint32 redunction_affected_damage = CalcNotIgnoreDamageRedunction(damage,damageInfo->damageSchoolMask); + uint32 redunction_affected_damage = CalcNotIgnoreDamageRedunction(damageInfo->damage,damageInfo->damageSchoolMask); + uint32 resilienceReduction; if (attackType != RANGED_ATTACK) - damage -= pVictim->GetMeleeDamageReduction(redunction_affected_damage); + resilienceReduction = pVictim->GetMeleeDamageReduction(redunction_affected_damage); else - damage -= pVictim->GetRangedDamageReduction(redunction_affected_damage); + resilienceReduction = pVictim->GetRangedDamageReduction(redunction_affected_damage); + damageInfo->damage -= resilienceReduction; + damageInfo->cleanDamage += resilienceReduction; } // Calculate absorb resist diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index dd1a58ef7..269c59c39 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9580" + #define REVISION_NR "9581" #endif // __REVISION_NR_H__