diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-09-25 22:51:42 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2015-09-25 22:51:42 +0200 |
| commit | 3f24853e29c20c5a67394a76de2acb1a8b484018 (patch) | |
| tree | 2b757e35d73f6973c9a5c5e3e140be784ed232fb /src | |
| parent | e68ff4186e685de00362b12bc0b5084a4d6065dd (diff) | |
| parent | 946fdbc06b46ee3a357ebfff1128d9d9b38d83d0 (diff) | |
Merge pull request #15473 from Treeston/3.3.5-fixplayerdamagereq
Core/Unit: Player-summoned creature damage counts towards quest credit
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 3938b8d7278..f5bcd8f23e8 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -721,7 +721,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam if (!victim->ToCreature()->hasLootRecipient()) victim->ToCreature()->SetLootRecipient(this); - if (IsControlledByPlayer()) + if (IsControlledByPlayer() || (ToTempSummon() && ToTempSummon()->GetSummoner() && ToTempSummon()->GetSummoner()->GetTypeId() == TYPEID_PLAYER)) victim->ToCreature()->LowerPlayerDamageReq(health < damage ? health : damage); } |