aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2016-12-26 11:14:43 +0100
committerDoctorKraft <DoctorKraft@users.noreply.github.com>2018-03-18 00:19:36 +0100
commitf44572ce56989baffd7e1f6cbf62f39fa65ec343 (patch)
tree40f04eaadf287b7ffccf1388b67b5ef32726dde2 /src
parent0515184ba93e9a1c4236f8be881432696f48ec99 (diff)
Core/Units: Fixed exploit where killing tamed pet could yield emblems (#18605)
(cherry picked from commit 2aae46ad49851239f69910dc0ccd2efed87bdb10)
Diffstat (limited to 'src')
-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 4a03028ae15..1d6ba29800b 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10851,6 +10851,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)