From 295e4dd3c6eb66b26ca17771c78cda2685371099 Mon Sep 17 00:00:00 2001
From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com>
Date: Thu, 18 Jul 2024 20:19:36 -0400
Subject: [PATCH] fix(Core): Correct packet structure for combat stop messages.
 (#19434)

* Init.

* Reviewed changes.
---
 src/server/game/Entities/Unit/Unit.cpp     | 4 +++-
 src/server/game/Handlers/CombatHandler.cpp | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e2c636f86..d9837d0f6 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3051,10 +3051,12 @@ void Unit::SendMeleeAttackStop(Unit* victim)
 
     WorldPacket data(SMSG_ATTACKSTOP, (8 + 8 + 4));
     data << GetPackGUID();
+
     if (victim)
     {
+        uint8 nowDead = victim->isDead();
         data << victim->GetPackGUID();
-        data << victim->isDead();
+        data << nowDead;
     }
     SendMessageToSet(&data, true);
     LOG_DEBUG("entities.unit", "WORLD: Sent SMSG_ATTACKSTOP");
diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp
index 6a92526de..c1fecb778 100644
--- a/src/server/game/Handlers/CombatHandler.cpp
+++ b/src/server/game/Handlers/CombatHandler.cpp
@@ -86,10 +86,12 @@ void WorldSession::SendAttackStop(Unit const* enemy)
 {
     WorldPacket data(SMSG_ATTACKSTOP, (8 + 8 + 4)); // we guess size
     data << GetPlayer()->GetPackGUID();
+
     if (enemy)
     {
+        uint8 nowDead = enemy->isDead();
         data << enemy->GetPackGUID();               // must be packed guid
-        data << enemy->isDead();
+        data << nowDead;
     }
     SendPacket(&data);
 }