Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-26 07:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address quickbuilds being unbuildable

Browse Source 
Address an issue where quickbuilds would become unbuildable.  The main issue lied within serializing parent/child info too often for some reason / serializing it when the info wasnt dirty.  Only serializing this info when it is actually dirty and has changed has addressed the issue and allows quickbuilds to never break.
This commit is contained in:
EmosewaMC 2022-06-15 22:58:38 -07:00
parent 4556faf833
commit 8bdd5b6e2c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dGame/Entity.cpp
View File

@ -79,6 +79,7 @@ Entity::Entity(const LWOOBJID& objectID, EntityInfo info, Entity* parentEntity)
m_Components = {}; m_Components = {};
m_DieCallbacks = {}; m_DieCallbacks = {};
m_PhantomCollisionCallbacks = {}; m_PhantomCollisionCallbacks = {};
m_IsParentChildDirty = true;
m_Settings = info.settings; m_Settings = info.settings;
m_NetworkSettings = info.networkSettings; m_NetworkSettings = info.networkSettings;
@ -974,8 +975,9 @@ void Entity::WriteBaseReplicaData(RakNet::BitStream* outBitStream, eReplicaPacke
} }
else outBitStream->Write0(); //No GM Level else outBitStream->Write0(); //No GM Level
} }
outBitStream->Write((m_ParentEntity != nullptr || m_ChildEntities.size() > 0)); outBitStream->Write((m_ParentEntity != nullptr || m_ChildEntities.size() > 0) && (m_IsParentChildDirty || packetType == PACKET_TYPE_CONSTRUCTION));
if (m_ParentEntity || m_ChildEntities.size() > 0) { if ((m_ParentEntity != nullptr || m_ChildEntities.size() > 0) && (m_IsParentChildDirty || packetType == PACKET_TYPE_CONSTRUCTION)) {
m_IsParentChildDirty = false;
outBitStream->Write(m_ParentEntity != nullptr); outBitStream->Write(m_ParentEntity != nullptr);
if (m_ParentEntity) { if (m_ParentEntity) {
outBitStream->Write(m_ParentEntity->GetObjectID()); outBitStream->Write(m_ParentEntity->GetObjectID());
@ -1661,6 +1663,7 @@ void Entity::RegisterCoinDrop(uint64_t count) {
} }
void Entity::AddChild(Entity* child) { void Entity::AddChild(Entity* child) {
m_IsParentChildDirty = true;
m_ChildEntities.push_back(child); m_ChildEntities.push_back(child);
} }

2
dGame/Entity.h
View File

@ -322,6 +322,8 @@ protected:
int8_t m_Observers = 0; int8_t m_Observers = 0;
bool m_IsParentChildDirty = true;
/* /*
* Collision * Collision
*/ */