charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-17 18:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: don't apply any hybrid rpcs in host mode, fixes overwriting client's data points

Browse Source
This commit is contained in:
miwarnec 2024-11-04 22:04:46 +01:00
parent cab38f33d9
commit 128592051e
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs
View File

@ -342,6 +342,11 @@ void RpcServerToClientBaseline_PositionRotation(byte baselineTick, Vector3 posit
// ignore if this object is owned by this client. // ignore if this object is owned by this client.
if (IsClientWithAuthority) return; if (IsClientWithAuthority) return;
// host mode: baseline Rpc is also sent through host's local connection and applied.
// applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
// in other words: never apply the rpcs in host mode.
if (isServer) return;
// save last deserialized baseline tick number to compare deltas against // save last deserialized baseline tick number to compare deltas against
lastDeserializedBaselineTick = baselineTick; lastDeserializedBaselineTick = baselineTick;
lastDeserializedBaselinePosition = position; lastDeserializedBaselinePosition = position;
@ -364,6 +369,11 @@ void RpcServerToClientBaseline_Position(byte baselineTick, Vector3 position)
// ignore if this object is owned by this client. // ignore if this object is owned by this client.
if (IsClientWithAuthority) return; if (IsClientWithAuthority) return;
// host mode: baseline Rpc is also sent through host's local connection and applied.
// applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
// in other words: never apply the rpcs in host mode.
if (isServer) return;
// save last deserialized baseline tick number to compare deltas against // save last deserialized baseline tick number to compare deltas against
lastDeserializedBaselineTick = baselineTick; lastDeserializedBaselineTick = baselineTick;
lastDeserializedBaselinePosition = position; lastDeserializedBaselinePosition = position;
@ -385,6 +395,11 @@ void RpcServerToClientBaseline_Rotation(byte baselineTick, Quaternion rotation)
// ignore if this object is owned by this client. // ignore if this object is owned by this client.
if (IsClientWithAuthority) return; if (IsClientWithAuthority) return;
// host mode: baseline Rpc is also sent through host's local connection and applied.
// applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
// in other words: never apply the rpcs in host mode.
if (isServer) return;
// save last deserialized baseline tick number to compare deltas against // save last deserialized baseline tick number to compare deltas against
lastDeserializedBaselineTick = baselineTick; lastDeserializedBaselineTick = baselineTick;
lastDeserializedBaselineRotation = rotation; lastDeserializedBaselineRotation = rotation;
@ -404,6 +419,11 @@ void RpcServerToClientDelta_PositionRotation(byte baselineTick, Vector3 position
// ignore if this object is owned by this client. // ignore if this object is owned by this client.
if (IsClientWithAuthority) return; if (IsClientWithAuthority) return;
// host mode: baseline Rpc is also sent through host's local connection and applied.
// applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
// in other words: never apply the rpcs in host mode.
if (isServer) return;
// debug draw: delta // debug draw: delta
if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f); if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
@ -418,6 +438,11 @@ void RpcServerToClientDelta_Position(byte baselineTick, Vector3 position)
// ignore if this object is owned by this client. // ignore if this object is owned by this client.
if (IsClientWithAuthority) return; if (IsClientWithAuthority) return;
// host mode: baseline Rpc is also sent through host's local connection and applied.
// applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
// in other words: never apply the rpcs in host mode.
if (isServer) return;
// debug draw: delta // debug draw: delta
if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f); if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
@ -432,6 +457,11 @@ void RpcServerToClientDelta_Rotation(byte baselineTick, Quaternion rotation)
// ignore if this object is owned by this client. // ignore if this object is owned by this client.
if (IsClientWithAuthority) return; if (IsClientWithAuthority) return;
// host mode: baseline Rpc is also sent through host's local connection and applied.
// applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
// in other words: never apply the rpcs in host mode.
if (isServer) return;
OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation);//, scale); OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation);//, scale);
} }