From 2f1bf82b9d97898d45069b0c2ebc0fc32566f7b6 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 19 May 2026 23:14:26 +0200
Subject: [PATCH] Core/Units: Fixed AttackStop NowDead field being set for the
 wrong unit

(cherry picked from commit 345e0586114c2f8b9d2d35b89b6a66f213558274)
---
 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 f25d909542..beda0fcbb0 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2563,7 +2563,7 @@ void Unit::SendMeleeAttackStop(Unit const* victim) const
     WorldPackets::Combat::SAttackStop attackStop;
     attackStop.Attacker = GetGUID();
     attackStop.Victim = Object::GetGUID(victim);
-    attackStop.NowDead = victim && !victim->IsAlive();
+    attackStop.NowDead = !IsAlive();
     SendMessageToSet(attackStop.Write(), true);
 
     if (victim)