4.6.20R

- Fixed NetworkObject.GraphicalObject smoother not working as clientOnly.
- Fixed replicates from clients not running on server when using Inserted prediction order.
- Fixed TimeManager simulates calling SyncTransforms on Physics2D rather than Physics2D.Simulate.
- Added NetworkTickSmoother.FavorPredictionNetworkTransform. As true this disables smoothing when the NetworkObject enables prediction, specifies a NetworkTransform to use, and that NetworkTransform is currently smoothing.
- Fixed tick smoothers interferring with NetworkTransform when EnableStateForwarding was disabled.
- Fixed Prediction.Rigidbody demo creating reconcile in OnTick rather than OnPostTick.

Author: FirstGearGames

Assets/FishNet/Demos/Prediction/CharacterController/Scripts/CharacterControllerPrediction.cs

@@ -446,6 +446,8 @@ private void CharacterTrigger_OnEnter(Collider c)
         /// </summary>
         private void CharacterTrigger_OnExit(Collider c)
         {
+            if (c == null)
+                return;
             if (!c.TryGetComponent(out MovingPlatform mp))
                 return;
 

Assets/FishNet/Demos/Prediction/Rigidbody/Scripts/RigidbodyPrediction.cs

@@ -139,6 +139,10 @@ public override void OnStartNetwork()
         protected override void TimeManager_OnTick()
         {
             PerformReplicate(BuildMoveData());
+        }
+
+        protected override void TimeManager_OnPostTick()
+        {
             CreateReconcile();
         }
 

Assets/FishNet/Runtime/Generated/Component/NetworkTransform/NetworkTransform.cs

@@ -283,7 +283,7 @@ public enum ExtrapolateState : byte
             public TransformData() { }
 
             internal void SetIsDefaultToFalse() => IsDefault = false;
-            
+
             internal void Update(TransformData copy)
             {
                 Update(copy.Tick, copy.Position, copy.Rotation, copy.Scale, copy.ExtrapolatedPosition, copy.ParentBehaviour);
@@ -646,9 +646,8 @@ public void SetSendToOwner(bool value)
         /// </summary>
         private TimeManager _timeManager;
         #endregion
-        
+
         #region Private Profiler Markers
-        
         private static readonly ProfilerMarker _pm_OnUpdate = new("NetworkTransform.TimeManager_OnUpdate()");
         private static readonly ProfilerMarker _pm_OnPostTick = new("NetworkTransform.TimeManager_OnPostTick()");
         private static readonly ProfilerMarker _pm_MoveToTarget = new("NetworkTransform.MoveToTarget(float)");
@@ -657,7 +656,6 @@ public void SetSendToOwner(bool value)
         private static readonly ProfilerMarker _pm_ForceSend1 = new("NetworkTransform.ForceSend(uint)");
         private static readonly ProfilerMarker _pm_SendToClients = new("NetworkTransform.SendToClients()");
         private static readonly ProfilerMarker _pm_SendToServer = new("NetworkTransform.SendToServer(TransformData)");
-        
         #endregion
 
         #region Const.
@@ -779,7 +777,6 @@ private void TryClearGoalDatas_OwnershipChange(NetworkConnection prevOwner, bool
              * follow the queue. */
         }
 
-
         private void TimeManager_OnUpdate()
         {
             using (_pm_OnUpdate.Auto())
@@ -859,13 +856,13 @@ private void ConfigureComponents()
                         _initializedRigidbodyInterpolation2d = c.interpolation;
 
                     bool isKinematic = CanMakeKinematic();
-                    
+
                     #if UNITY_6000_1_OR_NEWER
                     c.bodyType = isKinematic ? RigidbodyType2D.Kinematic : RigidbodyType2D.Dynamic;
                     #else
                     c.isKinematic = isKinematic;
                     #endif
-                    
+
                     c.simulated = !isKinematic;
 
                     if (isKinematic)
@@ -1216,7 +1213,7 @@ private void SerializeChanged(ChangedDelta changed, PooledWriter writer, Transfo
             //Compressed axis value.
             float compressed;
             //Multiplier for compression.
-            float multiplier = 100f; 
+            float multiplier = 100f;
             /* Maximum value compressed may be
              * to send as compressed. */
             float maxValue = short.MaxValue - 1;
@@ -1620,119 +1617,131 @@ private void MoveToTarget(float delta)
         {
             using (_pm_MoveToTarget.Auto())
             {
-            if (_currentGoalData == null)
-                return;
-
-            //Cannot move if neither is active.
-            if (!IsServerInitialized && !IsClientInitialized)
-                return;
+                if (_currentGoalData == null)
+                    return;
 
-            //If client auth and the owner don't move towards target.
-            if (_clientAuthoritative)
-            {
-                if (IsOwner || TakenOwnership)
+                //Cannot move if neither is active.
+                if (!IsServerInitialized && !IsClientInitialized)
                     return;
-            }
-            else
-            {
-                //If not client authoritative, is owner, and don't sync to owner.
-                if (IsOwner && !_sendToOwner)
+
+                if (!DoSettingsAllowSmoothing())
                     return;
-            }
 
-            //True if not client controlled.
-            bool controlledByClient = _clientAuthoritative && Owner.IsActive;
-            //If not controlled by client and is server then no reason to move.
-            if (!controlledByClient && IsServerInitialized)
-                return;
+                /* Once here it's safe to assume the object will be moving.
+                 * Any checks which would stop it from moving be it client
+                 * auth and owner, or server controlled and server, ect,
+                 * would have already been run. */
+                TransformData td = _currentGoalData.Transforms;
+                RateData rd = _currentGoalData.Rates;
+
+                //Set parent.
+                if (_synchronizeParent)
+                    SetParent(td.ParentBehaviour, rd);
+
+                float multiplier = 1f;
+                int queueCount = _goalDataQueue.Count;
+                //Increase move rate slightly if over queue count.
+                if (queueCount > _interpolation + 1)
+                    multiplier += 0.05f;
+
+                //Rate to update. Changes per property.
+                float rate;
+                Transform t = _cachedTransform;
 
-            /* Once here it's safe to assume the object will be moving.
-             * Any checks which would stop it from moving be it client
-             * auth and owner, or server controlled and server, ect,
-             * would have already been run. */
-            TransformData td = _currentGoalData.Transforms;
-            RateData rd = _currentGoalData.Rates;
+                //Snap any bits of the transform that should be.
+                SnapProperties(td);
 
-            //Set parent.
-            if (_synchronizeParent)
-                SetParent(td.ParentBehaviour, rd);
+                //Position.
+                if (_synchronizePosition)
+                {
+                    rate = rd.Position;
+                    Vector3 posGoal = td.ExtrapolationState == TransformData.ExtrapolateState.Active && !_lastReceiveReliable ? td.ExtrapolatedPosition : td.Position;
+                    // ReSharper disable once CompareOfFloatsByEqualityOperator
+                    if (rate == -1f)
+                        t.localPosition = td.Position;
+                    else
+                        t.localPosition = Vector3.MoveTowards(t.localPosition, posGoal, rate * delta * multiplier);
+                }
 
-            float multiplier = 1f;
-            int queueCount = _goalDataQueue.Count;
-            //Increase move rate slightly if over queue count.
-            if (queueCount > _interpolation + 1)
-                multiplier += 0.05f;
+                //Rotation.
+                if (_synchronizeRotation)
+                {
+                    rate = rd.Rotation;
+                    // ReSharper disable once CompareOfFloatsByEqualityOperator
+                    if (rate == -1f)
+                        t.localRotation = td.Rotation;
+                    else
+                        t.localRotation = Quaternion.RotateTowards(t.localRotation, td.Rotation, rate * delta);
+                }
 
-            //Rate to update. Changes per property.
-            float rate;
-            Transform t = _cachedTransform;
+                //Scale.
+                if (_synchronizeScale)
+                {
+                    rate = rd.Scale;
+                    // ReSharper disable once CompareOfFloatsByEqualityOperator
+                    if (rate == -1f)
+                        t.localScale = td.Scale;
+                    else
+                        t.localScale = Vector3.MoveTowards(t.localScale, td.Scale, rate * delta);
+                }
 
-            //Snap any bits of the transform that should be.
-            SnapProperties(td);
+                float timeRemaining = rd.TimeRemaining - delta * multiplier;
+                if (timeRemaining < -delta)
+                    timeRemaining = -delta;
+                rd.TimeRemaining = timeRemaining;
 
-            //Position.
-            if (_synchronizePosition)
-            {
-                rate = rd.Position;
-                Vector3 posGoal = td.ExtrapolationState == TransformData.ExtrapolateState.Active && !_lastReceiveReliable ? td.ExtrapolatedPosition : td.Position;
-                // ReSharper disable once CompareOfFloatsByEqualityOperator
-                if (rate == -1f)
-                    t.localPosition = td.Position;
-                else
-                    t.localPosition = Vector3.MoveTowards(t.localPosition, posGoal, rate * delta * multiplier);
+                if (rd.TimeRemaining <= 0f)
+                {
+                    float leftOver = Mathf.Abs(rd.TimeRemaining);
+                    //If more in buffer then run next buffer.
+                    if (queueCount > 0)
+                    {
+                        SetCurrentGoalData(_goalDataQueue.Dequeue());
+                        if (leftOver > 0f)
+                            MoveToTarget(leftOver);
+                    }
+                    //No more in buffer, see if can extrapolate.
+                    else
+                    {
+                        /* If everything matches up then end queue.
+                             * Otherwise let it play out until stuff
+                             * aligns. Generally the time remaining is enough
+                             * but every once in awhile something goes funky
+                             * and it's thrown off. */
+                            if (!HasChanged(td))
+                                _currentGoalData = null;
+                            OnInterpolationComplete?.Invoke();
+                            }
+                }
             }
+        }
 
-            //Rotation.
-            if (_synchronizeRotation)
+        /// <summary>
+        /// True if settings are configured to smooth with the current network state.
+        /// </summary>
+        /// <returns></returns>
+        public bool DoSettingsAllowSmoothing() 
+        {
+            //If client auth and the owner don't move towards target.
+            if (_clientAuthoritative)
             {
-                rate = rd.Rotation;
-                // ReSharper disable once CompareOfFloatsByEqualityOperator
-                if (rate == -1f)
-                    t.localRotation = td.Rotation;
-                else
-                    t.localRotation = Quaternion.RotateTowards(t.localRotation, td.Rotation, rate * delta);
+                if (IsOwner || TakenOwnership)
+                    return false;
             }
-
-            //Scale.
-            if (_synchronizeScale)
+            else
             {
-                rate = rd.Scale;
-                // ReSharper disable once CompareOfFloatsByEqualityOperator
-                if (rate == -1f)
-                    t.localScale = td.Scale;
-                else
-                    t.localScale = Vector3.MoveTowards(t.localScale, td.Scale, rate * delta);
+                //If not client authoritative, is owner, and don't sync to owner.
+                if (IsOwner && !_sendToOwner)
+                    return false;
             }
 
-            float timeRemaining = rd.TimeRemaining - delta * multiplier;
-            if (timeRemaining < -delta)
-                timeRemaining = -delta;
-            rd.TimeRemaining = timeRemaining;
+            //True if not client controlled.
+            bool controlledByClient = _clientAuthoritative && Owner.IsActive;
+            //If not controlled by client and is server then no reason to move.
+            if (!controlledByClient && IsServerInitialized)
+                return false;
 
-            if (rd.TimeRemaining <= 0f)
-            {
-                float leftOver = Mathf.Abs(rd.TimeRemaining);
-                //If more in buffer then run next buffer.
-                if (queueCount > 0)
-                {
-                    SetCurrentGoalData(_goalDataQueue.Dequeue());
-                    if (leftOver > 0f)
-                        MoveToTarget(leftOver);
-                }
-                //No more in buffer, see if can extrapolate.
-                else
-                {
-                    /* If everything matches up then end queue.
-                         * Otherwise let it play out until stuff
-                         * aligns. Generally the time remaining is enough
-                         * but every once in awhile something goes funky
-                         * and it's thrown off. */
-                        if (!HasChanged(td))
-                            _currentGoalData = null;
-                        OnInterpolationComplete?.Invoke();
-                        }
-            }
-            }
+            return true;
         }
 
         /// <summary>
@@ -1978,11 +1987,11 @@ private ChangedDelta GetChanged(Vector3 lastPosition, Quaternion lastRotation, V
 
             if (changed != ChangedDelta.Unset && ParentBehaviour != null)
                 changed |= ChangedDelta.Nested;
-            
+
             //If added scale or childed then also add extended.
             if (startChanged != changed)
                 changed |= ChangedDelta.Extended;
-            
+
             return changed;
         }
         #endregion

Assets/FishNet/Runtime/Generated/Component/TickSmoothing/Editor/NetworkTickSmootherEditor.cs

@@ -10,13 +10,15 @@ public class NetworkTickSmootherEditor : Editor
     {
         private SerializedProperty _initializationSettings;
         private SerializedProperty _controllerMovementSettings;
+        private SerializedProperty _favorPredictionNetworkTransform;
         private SerializedProperty _spectatorMovementSettings;
         private bool _showControllerSmoothingSettings;
         private bool _showSpectatorSmoothingSettings;
 
         protected virtual void OnEnable()
         {
             _initializationSettings = serializedObject.FindProperty(nameof(_initializationSettings));
+            _favorPredictionNetworkTransform = serializedObject.FindProperty(nameof(_favorPredictionNetworkTransform));
             _controllerMovementSettings = serializedObject.FindProperty(nameof(_controllerMovementSettings));
             _spectatorMovementSettings = serializedObject.FindProperty(nameof(_spectatorMovementSettings));
         }
@@ -29,17 +31,19 @@ public override void OnInspectorGUI()
             EditorGUILayout.ObjectField("Script:", MonoScript.FromMonoBehaviour((NetworkTickSmoother)target), typeof(NetworkTickSmoother), false);
             GUI.enabled = true;
 
-            // EditorGUILayout.LabelField("Initialization Settings", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(_favorPredictionNetworkTransform);
 
             EditorGUILayout.PropertyField(_initializationSettings);
 
-            _showControllerSmoothingSettings = EditorGUILayout.Foldout(_showControllerSmoothingSettings, new GUIContent("Controller Smoothing", "Smoothing applied when object controller. This would be the owner, or if there is no owner and are also server."));
+            _showControllerSmoothingSettings = EditorGUILayout.Foldout(_showControllerSmoothingSettings, new GUIContent("Controller", "Smoothing applied when object controller. This would be the owner, or if there is no owner and are also server."));
             if (_showControllerSmoothingSettings)
                 EditorGUILayout.PropertyField(_controllerMovementSettings);
 
             _showSpectatorSmoothingSettings = EditorGUILayout.Foldout(_showSpectatorSmoothingSettings, new GUIContent("Spectator Smoothing", "Smoothing applied when object not the owner. This is when server and there is an owner, or when client and not the owner."));
             if (_showSpectatorSmoothingSettings)
+            {
                 EditorGUILayout.PropertyField(_spectatorMovementSettings);
+            }
 
 
             // EditorGUI.indentLevel--;

Assets/FishNet/Runtime/Generated/Component/TickSmoothing/InitializationSettings.cs

@@ -45,22 +45,31 @@ public struct InitializationSettings
         /// </summary>
         [System.NonSerialized]
         internal TimeManager InitializingTimeManager;
+        /// <summary>
+        /// True to disable smoothing when the NetworkObject enables prediction, specifies a NetworkTransform to use, and that NetworkTransform is currently smoothing.
+        /// </summary>
+        [System.NonSerialized]
+        internal bool FavorPredictionNetworkTransform;
 
-        public void SetNetworkedRuntimeValues(NetworkBehaviour initializingNetworkBehaviour, Transform graphicalTransform)
+        public void SetNetworkedRuntimeValues(NetworkBehaviour initializingNetworkBehaviour, Transform graphicalTransform, bool favorPredictionNetworkTransform)
         {
             InitializingNetworkBehaviour = initializingNetworkBehaviour;
-            GraphicalTransform = graphicalTransform;
             InitializingTimeManager = initializingNetworkBehaviour.TimeManager;
+            GraphicalTransform = graphicalTransform;
+            
+            FavorPredictionNetworkTransform = favorPredictionNetworkTransform;
         }
 
         /// <summary>
         /// Sets values used at runtime. NetworkBehaviour is nullified when calling this method.
         /// </summary>
         public void SetOfflineRuntimeValues(TimeManager timeManager, Transform graphicalTransform)
         {
-            InitializingNetworkBehaviour = null;
             GraphicalTransform = graphicalTransform;
             InitializingTimeManager = timeManager;
+            
+            InitializingNetworkBehaviour = null;
+            FavorPredictionNetworkTransform = false;
         }
     }
 }