From ec0e9ebc876e99798b3bd15facfbc1c0a7fce024 Mon Sep 17 00:00:00 2001
From: schell244 <schell244@web.de>
Date: Tue, 15 Sep 2026 16:42:43 +0200
Subject: [PATCH] Move DestroyObject out of Misc and next to the other object
 update packets.

---
 src/game/Objects/Object.cpp              |  2 +-
 src/game/Objects/Player.cpp              |  4 ++--
 src/game/Server/Packets/Misc.cpp         | 10 ----------
 src/game/Server/Packets/Misc.h           | 10 ----------
 src/game/Server/Packets/ObjectUpdate.cpp | 10 ++++++++++
 src/game/Server/Packets/ObjectUpdate.h   | 10 ++++++++++
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/game/Objects/Object.cpp b/src/game/Objects/Object.cpp
index c85c42185..57d91fbbf 100644
--- a/src/game/Objects/Object.cpp
+++ b/src/game/Objects/Object.cpp
@@ -498,7 +498,7 @@ void Object::DestroyForPlayer(Player const* target) const
 {
     MANGOS_ASSERT(target);
 
-    auto packet = std::make_unique<WorldPackets::Misc::DestroyObject>();
+    auto packet = std::make_unique<WorldPackets::ObjectUpdate::DestroyObject>();
     packet->objectGuid = GetObjectGuid();
     target->GetSession()->SendPacket(std::move(packet));
 }
diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp
index a29a9fede..5061eaebb 100644
--- a/src/game/Objects/Player.cpp
+++ b/src/game/Objects/Player.cpp
@@ -1836,7 +1836,7 @@ bool Player::SwitchInstance(uint32 newInstanceId)
 
     for (const auto& guid : m_visibleGUIDs)
     {
-        auto packet = std::make_unique<WorldPackets::Misc::DestroyObject>();
+        auto packet = std::make_unique<WorldPackets::ObjectUpdate::DestroyObject>();
         packet->objectGuid = guid;
         GetSession()->SendPacket(std::move(packet));
     }
@@ -21740,7 +21740,7 @@ void Player::SendDestroyGroupMembers(bool includingSelf)
         {
             if (!includingSelf && itr.guid == GetObjectGuid())
                 continue;
-            auto packet = std::make_unique<WorldPackets::Misc::DestroyObject>();
+            auto packet = std::make_unique<WorldPackets::ObjectUpdate::DestroyObject>();
             packet->objectGuid = itr.guid;
             GetSession()->SendPacket(std::move(packet));
             m_visibleGUIDs.erase(itr.guid);
diff --git a/src/game/Server/Packets/Misc.cpp b/src/game/Server/Packets/Misc.cpp
index b7fca7238..2a1bf2954 100644
--- a/src/game/Server/Packets/Misc.cpp
+++ b/src/game/Server/Packets/Misc.cpp
@@ -612,16 +612,6 @@ void WorldPackets::Misc::InvalidatePlayer::AppendBodyTo(ByteBuffer& buffer) cons
 }
 #endif
 
-size_t WorldPackets::Misc::DestroyObject::EstimateFinalSize() const
-{
-    return sizeof(objectGuid);
-}
-
-void WorldPackets::Misc::DestroyObject::AppendBodyTo(ByteBuffer& buffer) const
-{
-    buffer << objectGuid;
-}
-
 size_t WorldPackets::Misc::AiReaction::EstimateFinalSize() const
 {
     return sizeof(unitGuid) +
diff --git a/src/game/Server/Packets/Misc.h b/src/game/Server/Packets/Misc.h
index 787dae6dd..c1366df8e 100644
--- a/src/game/Server/Packets/Misc.h
+++ b/src/game/Server/Packets/Misc.h
@@ -685,16 +685,6 @@ namespace WorldPackets { namespace Misc
     };
 #endif
 
-    class DestroyObject final : public ServerPacket
-    {
-    public:
-        ObjectGuid objectGuid; // guid of the object to destroy
-
-        explicit DestroyObject() : ServerPacket(SMSG_DESTROY_OBJECT) {}
-        size_t EstimateFinalSize() const override;
-        void AppendBodyTo(ByteBuffer& buffer) const override;
-    };
-
     class AiReaction final : public ServerPacket
     {
     public:
diff --git a/src/game/Server/Packets/ObjectUpdate.cpp b/src/game/Server/Packets/ObjectUpdate.cpp
index 11dc393e6..fa3113c64 100644
--- a/src/game/Server/Packets/ObjectUpdate.cpp
+++ b/src/game/Server/Packets/ObjectUpdate.cpp
@@ -5,6 +5,16 @@
 #include "World.h"
 #include <zlib.h>
 
+size_t WorldPackets::ObjectUpdate::DestroyObject::EstimateFinalSize() const
+{
+    return sizeof(objectGuid);
+}
+
+void WorldPackets::ObjectUpdate::DestroyObject::AppendBodyTo(ByteBuffer& buffer) const
+{
+    buffer << objectGuid;
+}
+
 size_t WorldPackets::ObjectUpdate::UpdateObject::EstimateFinalSize() const
 {
     // The size depends on whether the packet ends up compressed, so
diff --git a/src/game/Server/Packets/ObjectUpdate.h b/src/game/Server/Packets/ObjectUpdate.h
index 17e1d36a9..70b184f1c 100644
--- a/src/game/Server/Packets/ObjectUpdate.h
+++ b/src/game/Server/Packets/ObjectUpdate.h
@@ -7,6 +7,16 @@
 
 namespace WorldPackets { namespace ObjectUpdate
 {
+    class DestroyObject final : public ServerPacket
+    {
+    public:
+        ObjectGuid objectGuid; // guid of the object to destroy
+
+        explicit DestroyObject() : ServerPacket(SMSG_DESTROY_OBJECT) {}
+        size_t EstimateFinalSize() const override;
+        void AppendBodyTo(ByteBuffer& buffer) const override;
+    };
+
     class UpdateObject final : public ServerPacket
     {
     public: