From bdc6cdfcc17488e68ea944f1c80540f5d0339c79 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 9 Mar 2022 14:53:21 -0500
Subject: [PATCH] Core/Objects: Don't consider SMSG_UPDATE_OBJECT packets that
 contain only destroyed objects as empty

Port From (https://github.com/TrinityCore/TrinityCore/commit/faf12a888394f220fa057526b56bd456f3790f4f)
---
 Source/Game/Entities/DynamicObject.cs            | 3 ---
 Source/Game/Entities/Object/Update/UpdateData.cs | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Source/Game/Entities/DynamicObject.cs b/Source/Game/Entities/DynamicObject.cs
index 86b26039a..06e0d5498 100644
--- a/Source/Game/Entities/DynamicObject.cs
+++ b/Source/Game/Entities/DynamicObject.cs
@@ -163,10 +163,7 @@ namespace Game.Entities
         public void Remove()
         {
             if (IsInWorld)
-            {
-                RemoveFromWorld();
                 AddObjectToRemoveList();
-            }
         }
 
         int GetDuration()
diff --git a/Source/Game/Entities/Object/Update/UpdateData.cs b/Source/Game/Entities/Object/Update/UpdateData.cs
index 4d70faf2e..5051fb585 100644
--- a/Source/Game/Entities/Object/Update/UpdateData.cs
+++ b/Source/Game/Entities/Object/Update/UpdateData.cs
@@ -93,7 +93,7 @@ namespace Game.Entities
             MapId = 0;
         }
 
-        public bool HasData() { return BlockCount > 0 || outOfRangeGUIDs.Count != 0; }
+        public bool HasData() { return BlockCount > 0 || !outOfRangeGUIDs.Empty() || !destroyGUIDs.Empty(); }
 
         public List<ObjectGuid> GetOutOfRangeGUIDs() { return outOfRangeGUIDs; }