From b53011c5ef3046fd1ac174dcbea76bcc8ebb3d38 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 4 Apr 2026 00:09:27 -0300 Subject: [PATCH] fix(Core/Units): Include charmed creatures in damagedByPlayer check (#25171) Co-authored-by: Claude Opus 4.6 --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index ce7e5c5b9..bf75c804a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1204,7 +1204,8 @@ 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->IsPlayer() || attacker->m_movedByPlayer != nullptr); + bool damagedByPlayer = unDamage && attacker && (attacker->IsPlayer() || attacker->m_movedByPlayer != nullptr + || attacker->GetCharmerOrOwnerGUID().IsPlayer()); victim->ToCreature()->LowerPlayerDamageReq(unDamage, damagedByPlayer); } }