Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-14 15:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(entity): children once each in id order, and the count matches the ids sent

Browse Source 
The client keeps an object's children as a set of ids
(LWOGameObject::childObjects). Every multi-child list in the live captures
(57) was in ascending id order. A child added twice is now kept once. The
child count also counted entries the loop then skipped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-10-02 08:55:04 -05:00
parent 6f4fd4054a
commit 3236d9f08a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dGame/Entity.cpp
View File

@@ -747,7 +747,7 @@ void Entity::WriteBaseReplicaData(RakNet::BitStream& outBitStream, eReplicaPacke
}
outBitStream.Write(!m_ChildEntities.empty());
if (!m_ChildEntities.empty()) {
outBitStream.Write<uint16_t>(m_ChildEntities.size());
outBitStream.Write<uint16_t>(std::ranges::count_if(m_ChildEntities, [](const Entity* child) { return child != nullptr; }));
for (const auto* const child : m_ChildEntities) {
if (child) outBitStream.Write<LWOOBJID>(child->GetObjectID());
}
@@ -1261,9 +1261,14 @@ void Entity::RegisterCoinDrop(uint64_t count) const {
characterComponent->SetDroppedCoins(characterComponent->GetDroppedCoins() + count);
}
// The client keeps an object's children as a set of ids (LWOGameObject::childObjects): once each, in id order
void Entity::AddChild(Entity* child) {
if (!child) return;
const auto id = child->GetObjectID();
const auto it = std::ranges::lower_bound(m_ChildEntities, id, {}, [](const Entity* entity) { return entity ? entity->GetObjectID() : LWOOBJID_EMPTY; });
if (it != m_ChildEntities.end() && *it && (*it)->GetObjectID() == id) return;
m_IsParentChildDirty = true;
m_ChildEntities.push_back(child);
m_ChildEntities.insert(it, child);
}
void Entity::RemoveChild(Entity* child) {