diff options
| author | Warpten <vertozor@gmail.com> | 2014-05-22 20:04:27 +0200 |
|---|---|---|
| committer | Warpten <vertozor@gmail.com> | 2014-05-22 20:04:27 +0200 |
| commit | fa31b161ccb868ddd7f330f50d4e6c267261f533 (patch) | |
| tree | a39babebadc2f664247cf0b2f7bfca728c1727c6 /src | |
| parent | 8ddb1125699bdd85ebf5bc8dd4747206c03c0286 (diff) | |
| parent | 4d3156e0b86c0c463cd2321f37632267492a1d7b (diff) | |
Merge pull request #12102 from Trisjdc/achievements
Core/Achievements: Fixed ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS in case killed creature has a loot recipient (Credit would be granted to loot recipient rather than killing blow lander)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 666bbe86249..abc16256b73 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15233,8 +15233,8 @@ void Unit::Kill(Unit* victim, bool durabilityLoss) // update get killing blow achievements, must be done before setDeathState to be able to require auras on target // and before Spirit of Redemption as it also removes auras - if (player) - player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, victim); + if (Player* killerPlayer = GetCharmerOrOwnerPlayerOrPlayerItself()) + killerPlayer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, victim); // if talent known but not triggered (check priest class for speedup check) bool spiritOfRedemption = false; |