diff --git a/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs b/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs index ad9498fd0..309c384b6 100644 --- a/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs +++ b/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs @@ -684,8 +684,13 @@ void UpdateServer() // should we broadcast at all? if (!disableSendingThisToClients) // CUSTOM CHANGE: see comment at definition { - UpdateServerBaseline(localTime); - UpdateServerDelta(localTime); + // only broadcast for server owned objects. + // otherwise server would overwrite ClientToServer object's baselines. + if (syncDirection == SyncDirection.ServerToClient || IsClientWithAuthority) + { + UpdateServerBaseline(localTime); + UpdateServerDelta(localTime); + } } // interpolate remote clients