Skip to content

Commit 5446a6e

Browse files
update
Including the scenario where SwitchTransformSpaceWhenParented was set while UseUnreliableDeltas had already been set.
1 parent 54e4087 commit 5446a6e

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,13 +1961,25 @@ private void TryCommitTransform(bool synchronize = false, bool settingState = fa
19611961
}
19621962
#endif
19631963
// Authority check to assure that UseUnreliableDeltas is not set during runtime while using SwitchTransformSpaceWhenParented.
1964-
if (SwitchTransformSpaceWhenParented && UseUnreliableDeltas && !m_LocalAuthoritativeNetworkState.FlagStates.UnreliableFrameSync)
1964+
if (SwitchTransformSpaceWhenParented && UseUnreliableDeltas)
19651965
{
1966-
if (m_CachedNetworkManager.LogLevel <= LogLevel.Normal)
1966+
// If we didn't have UseUnreliableDeltas previously set...
1967+
if (!m_LocalAuthoritativeNetworkState.FlagStates.UnreliableFrameSync)
19671968
{
1968-
Debug.LogWarning($"Reverting {nameof(UseUnreliableDeltas)} back to fals as it cannot be enable while {nameof(SwitchTransformSpaceWhenParented)} is enabled!");
1969+
if (m_CachedNetworkManager.LogLevel <= LogLevel.Normal)
1970+
{
1971+
Debug.LogWarning($"Reverting {nameof(UseUnreliableDeltas)} back to false as it cannot be enable while {nameof(SwitchTransformSpaceWhenParented)} is enabled!");
1972+
}
1973+
UseUnreliableDeltas = false;
1974+
}
1975+
else // Otherwise SwitchTransformSpaceWhenParented has changed while UseUnreliableDeltas was already set.
1976+
{
1977+
if (m_CachedNetworkManager.LogLevel <= LogLevel.Normal)
1978+
{
1979+
Debug.LogWarning($"Reverting {nameof(SwitchTransformSpaceWhenParented)} back to false as it cannot be enable while {nameof(UseUnreliableDeltas)} is enabled!");
1980+
}
1981+
SwitchTransformSpaceWhenParented = false;
19691982
}
1970-
UseUnreliableDeltas = false;
19711983
}
19721984

19731985
// If the transform has deltas (returns dirty) or if an explicitly set state is pending

0 commit comments

Comments
 (0)