From faf12a888394f220fa057526b56bd456f3790f4f Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 29 Jan 2022 19:44:55 +0100 Subject: Core/Objects: Don't consider SMSG_UPDATE_OBJECT packets that contain only destroyed objects as empty --- src/server/game/Entities/DynamicObject/DynamicObject.cpp | 3 --- src/server/game/Entities/Object/Updates/UpdateData.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index 4a9cceedb0a..b1ccf7bc527 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -166,10 +166,7 @@ void DynamicObject::Update(uint32 p_time) void DynamicObject::Remove() { if (IsInWorld()) - { - RemoveFromWorld(); AddObjectToRemoveList(); - } } int32 DynamicObject::GetDuration() const diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index 9b185ea14e2..08cfa498f18 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -48,7 +48,7 @@ class UpdateData void AddOutOfRangeGUID(ObjectGuid guid); void AddUpdateBlock(ByteBuffer const& block); bool BuildPacket(WorldPacket* packet); - bool HasData() const { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty(); } + bool HasData() const { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty() || !m_destroyGUIDs.empty(); } void Clear(); GuidSet const& GetOutOfRangeGUIDs() const { return m_outOfRangeGUIDs; } -- cgit v1.2.3