mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-20 10:45:27 +00:00
Merge exp/seamless-transfer-2: seamless instance moves keep the player in place
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -143,8 +143,11 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream& outBitStream, bo
|
||||
if (!bIsInitialUpdate) m_DirtyBubble = false;
|
||||
}
|
||||
|
||||
outBitStream.Write(m_DirtyPosition || bIsInitialUpdate);
|
||||
if (m_DirtyPosition || bIsInitialUpdate) {
|
||||
// A client that kept its player across a seamless instance move knows where it stands better than the save does:
|
||||
// its construction leaves the frame out, and LWOBasePhysComponent::Deserialize (0x00bf5a10) then sets nothing
|
||||
const bool writePosition = bIsInitialUpdate ? !m_KeepClientPosition : m_DirtyPosition;
|
||||
outBitStream.Write(writePosition);
|
||||
if (writePosition) {
|
||||
outBitStream.Write(m_Position.x);
|
||||
outBitStream.Write(m_Position.y);
|
||||
outBitStream.Write(m_Position.z);
|
||||
|
||||
@@ -216,6 +216,13 @@ public:
|
||||
*/
|
||||
bool GetIsTeleporting() const { return m_IsTeleporting; }
|
||||
|
||||
/**
|
||||
* Constructions written while this is set carry no position, rotation or velocity. For the one construction a
|
||||
* client gets of its own player after a seamless instance move (docs/SeamlessTransfer.md): the client applies a
|
||||
* construction's frame to its player at once, which would pull it back to where it was saved.
|
||||
*/
|
||||
void SetKeepClientPosition(const bool value) { m_KeepClientPosition = value; }
|
||||
|
||||
/**
|
||||
* Returns the Physics entity for the component
|
||||
* @return Physics entity for the component
|
||||
@@ -400,6 +407,11 @@ private:
|
||||
*/
|
||||
void UpdateSpeedBoost();
|
||||
|
||||
/**
|
||||
* Whether constructions leave the position out (SetKeepClientPosition)
|
||||
*/
|
||||
bool m_KeepClientPosition = false;
|
||||
|
||||
/**
|
||||
* The list of speed boosts for this entity
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user