mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-16 08:45:27 +00:00
fix(entity): send updatesWithParentPosition from the spawn behavior, as live
The parent info always said the object doesn't move with its parent. Live sent true for objects a spawn behavior made with updatePositionWithParent (all 70 Engineer Personal Fortress constructions in the captures, LOT 9479, and the Summoner's Scratch, 9644); the client then moves them with the player. Every other construction in the captures sent false, and none sent an object world state, which stays unsent. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -728,7 +728,7 @@ void Entity::WriteBaseReplicaData(RakNet::BitStream& outBitStream, eReplicaPacke
|
||||
outBitStream.Write(m_ParentEntity != nullptr);
|
||||
if (m_ParentEntity) {
|
||||
outBitStream.Write(m_ParentEntity->GetObjectID());
|
||||
outBitStream.Write0(); // Updates position with parent, usually false in live. Haven't seen a case where its supposed to be true
|
||||
outBitStream.Write(m_UpdatesWithParentPosition);
|
||||
}
|
||||
outBitStream.Write(!m_ChildEntities.empty());
|
||||
if (!m_ChildEntities.empty()) {
|
||||
|
||||
@@ -370,6 +370,10 @@ public:
|
||||
// Scale will only be communicated to the client when the construction packet is sent
|
||||
void SetScale(const float scale) { m_Scale = scale; };
|
||||
|
||||
// The client moves the object with its parent (LWOGameObject::updatesWithParentPosition), sent with the parent;
|
||||
// the spawn behavior's updatePositionWithParent sets it (live: the Engineer Personal Fortress, LOT 9479)
|
||||
void SetUpdatesWithParentPosition(const bool value) { m_UpdatesWithParentPosition = value; m_IsParentChildDirty = true; }
|
||||
|
||||
// The zone scene the object was placed in (EntityInfo::scene), -1 when it came from none
|
||||
int32_t GetScene() const { return m_Scene; }
|
||||
|
||||
@@ -466,6 +470,7 @@ private:
|
||||
int8_t m_Observers = 0;
|
||||
|
||||
bool m_IsParentChildDirty = true;
|
||||
bool m_UpdatesWithParentPosition = false;
|
||||
|
||||
// When this object was created on this server. Construction sends its age from this, as live did.
|
||||
std::chrono::steady_clock::time_point m_CreationTime = std::chrono::steady_clock::now();
|
||||
|
||||
@@ -51,6 +51,7 @@ void SpawnBehavior::Handle(BehaviorContext* context, RakNet::BitStream& bitStrea
|
||||
}
|
||||
|
||||
entity->SetOwnerOverride(context->originator);
|
||||
entity->SetUpdatesWithParentPosition(m_UpdatePositionWithParent);
|
||||
|
||||
// Unset the flag to reposition the player, this makes it harder to glitch out of the map
|
||||
auto* quickBuildComponent = entity->GetComponent<QuickBuildComponent>();
|
||||
@@ -106,4 +107,5 @@ void SpawnBehavior::End(BehaviorContext* context, const BehaviorBranchContext br
|
||||
void SpawnBehavior::Load() {
|
||||
this->m_lot = GetInt("LOT_ID");
|
||||
this->m_Distance = GetFloat("distance");
|
||||
this->m_UpdatePositionWithParent = GetBoolean("updatePositionWithParent");
|
||||
}
|
||||
|
||||
@@ -6,6 +6,8 @@ class SpawnBehavior final : public Behavior
|
||||
public:
|
||||
LOT m_lot;
|
||||
float m_Distance;
|
||||
// The spawned object moves with the one that spawned it (its parent)
|
||||
bool m_UpdatePositionWithParent;
|
||||
|
||||
/*
|
||||
* Inherited
|
||||
|
||||
Reference in New Issue
Block a user