diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-09-15 13:50:20 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-27 21:59:02 +0100 |
| commit | 9da35aa3bd086be000134c913d02f4692041e1ff (patch) | |
| tree | 11a3f107188a66029e46a949aa3cb9cf13ef7dba /src | |
| parent | 766433f5047efbf28655ad13f5db2da7c3a70064 (diff) | |
Core/Achievement: do not consider overkill damage for ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE.
(cherry picked from commit 4eb799560ccf340c3ec8313069c97f137c1e4a68)
Fix wrong copy-paste from last commit.
Sorry.
(cherry picked from commit c41b4000f9babb23df9d62952070a339174cf7b0)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 67f8f2d74b5..6553cb5a1ca 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -745,7 +745,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam if (Battleground* bg = killer->GetBattleground()) bg->UpdatePlayerScore(killer, SCORE_DAMAGE_DONE, damage); - killer->UpdateCriteria(CRITERIA_TYPE_DAMAGE_DONE, damage, 0, 0, victim); + killer->UpdateCriteria(CRITERIA_TYPE_DAMAGE_DONE, health > damage ? damage : health, 0, 0, victim); killer->UpdateCriteria(CRITERIA_TYPE_HIGHEST_HIT_DEALT, damage); } |