From 2dcf38a847f96af4dc7a857ba9e160397d5f8680 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Tue, 6 Dec 2022 16:49:19 +0100 Subject: [PATCH] fix(Core/Players): Fixed awarding kill credit while being on vehicles. (#13944) Fixes #12849 --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index b0ba39521..ab8a0b2b3 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1031,7 +1031,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage if (!attacker || attacker->IsControlledByPlayer() || attacker->IsCreatedByPlayer()) { uint32 unDamage = health < damage ? health : damage; - bool damagedByPlayer = unDamage && attacker && attacker->m_movedByPlayer != nullptr; + bool damagedByPlayer = unDamage && attacker && (attacker->IsPlayer() || attacker->m_movedByPlayer != nullptr); victim->ToCreature()->LowerPlayerDamageReq(unDamage, damagedByPlayer); } }