aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2016-12-26 11:14:43 +0100
committerShauren <shauren.trinity@gmail.com>2016-12-26 11:14:43 +0100
commit2aae46ad49851239f69910dc0ccd2efed87bdb10 (patch)
treea1e627c70040cd44a48220867150fb425ece3fbe
parent3665765bd3674aa01542dd593992d8b877c32007 (diff)
Core/Units: Fixed exploit where killing tamed pet could yield emblems (#18605)
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 53c778fccd6..c3e4d086024 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11567,6 +11567,10 @@ void Unit::Kill(Unit* victim, bool durabilityLoss)
if (isRewardAllowed && creature && creature->GetLootRecipient())
player = creature->GetLootRecipient();
+ // Exploit fix
+ if (creature && creature->IsPet() && creature->GetOwnerGUID().IsPlayer())
+ isRewardAllowed = false;
+
// Reward player, his pets, and group/raid members
// call kill spell proc event (before real die and combat stop to triggering auras removed at death/combat stop)
if (isRewardAllowed && player && player != victim)