4.6.12

- Fixed another NullReferenceException when NetworkTrafficStatics were enabled.
- Added NetworkTransform.SetInterpolation.
- Added NetworkTransform.SetExtrapolation.

Author: FirstGearGames

Assets/FishNet/CodeGenerating/Processing/Rpc/RpcProcessor.cs

@@ -854,8 +854,6 @@ private MethodDefinition CreateRpcLogicMethod(List<AttributeData> datas, Created
             TypeDefinition typeDef = cr.TypeDef;
             MethodDefinition originalMd = cr.OriginalMethodDef;
 
-            
-
             //Methodname for logic methods do not use prefixes because there can be only one.
             string methodName = $"{LOGIC_PREFIX}{GetMethodNameAsParameters(originalMd)}";
 
@@ -968,8 +966,6 @@ private void RedirectOriginalToWriter(List<CreatedRpc> createdRpcs)
              * entry. */
             MethodDefinition originalMd = createdRpcs[0].OriginalMethodDef;
 
-            
-
             ILProcessor processor = originalMd.Body.GetILProcessor();
             originalMd.Body.Instructions.Clear();
 

Assets/FishNet/Runtime/Editor/NetworkProfiler/Types.cs

@@ -59,7 +59,16 @@ public BidirectionalNetworkTraffic CloneUsingCache()
 
             return traffic;
         }
-        
+
+        /// <summary>
+        /// Re-initializes by calling ResetState, then InitializeState.
+        /// </summary>
+        public void Reinitialize() 
+        {
+            ResetState();
+            InitializeState();
+        }
+
         public void ResetState()
         {
             ResettableObjectCaches<NetworkTraffic>.StoreAndDefault(ref InboundTraffic);
@@ -234,6 +243,7 @@ public void SetPacketGroupPercentages()
 
         public void ResetState()
         {
+            Bytes = 0;
             ResettableT2CollectionCaches<PacketId, PacketGroup>.StoreAndDefault(ref _packetGroups);
         }
 

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

@@ -647,7 +647,6 @@ private void InitializeOnce()
             foreach (AnimatorControllerParameter item in _animator.parameters)
             {
                 bool process = !_animator.IsParameterControlledByCurve(item.name);
-                
                 if (process)
                 {
                     //Over 250 parameters; who would do this!?

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

@@ -59,7 +59,6 @@ public override void OnInspectorGUI()
             LayoutTools.AddObjectField("Script:", MonoScript.FromMonoBehaviour((NetworkTransform)target), typeof(NetworkTransform), false, EditorLayoutEnableType.Disabled);
 
             bool isPro = false;
-            
             if (isPro)
                 EditorGUILayout.HelpBox(EditingConstants.PRO_ASSETS_UNLOCKED_TEXT, MessageType.None);
             else

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

@@ -445,6 +445,7 @@ public void SetSendToOwner(bool value)
         /// </summary>
         /// <param name = "value">New value.</param>
         public void SetSynchronizePosition(bool value) => _synchronizePosition = value;
+
         /// <summary>
         /// Distance sensitivity on position checks.
         /// </summary>
@@ -504,6 +505,7 @@ public void SetSendToOwner(bool value)
         [Range(0.00001f, 1.25f)]
         [SerializeField]
         private float _scaleSensitivity = 0.001f;
+
         /// <summary>
         /// Sets if to synchronize scale.
         /// </summary>
@@ -971,6 +973,25 @@ private void ChangeUpdateSubscription(bool subscribe)
                 _timeManager.OnUpdate -= TimeManager_OnUpdate;
         }
 
+        /// <summary>
+        /// Sets the interpolation value.
+        /// </summary>
+        public void SetInterpolation(ushort value)
+        {
+            if (value < 1)
+                value = 1;
+            
+            _interpolation = value;
+        }
+
+        /// <summary>
+        /// Sets the extrapolation value.
+        /// </summary>
+        public void SetExtrapolation(ushort value)
+        {
+            _extrapolation = value;
+        }
+
         /// <summary>
         /// Returns if controlling logic can be run. This may be the server when there is no owner, even if client authoritative, and more.
         /// </summary>
@@ -979,15 +1000,12 @@ private bool CanControl()
         {
             //Client auth.
             if (_clientAuthoritative)
-            {
                 return IsController;
-            }
+
+
             //Server auth.
-            else
-            {
-                if (IsServerInitialized)
-                    return true;
-            }
+            if (IsServerInitialized)
+                return true;
 
             //Fall through.
             return false;
@@ -1625,17 +1643,15 @@ private void MoveToTarget(float delta)
                 //No more in buffer, see if can extrapolate.
                 else
                 {
-                    
-                        /* If everything matches up then end queue.
+                    /* 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();
-                        
-                }
+                        }
             }
         }
 
@@ -2135,13 +2151,12 @@ private uint GetTickDifference(TransformData prevTd, GoalData nextGd, uint minim
         /// <summary>
         /// Sets extrapolation data on next.
         /// </summary>
-        private void SetExtrapolation(TransformData prev, TransformData next, Channel channel)
+        private void SetExtrapolatedData(TransformData prev, TransformData next, Channel channel)
         {
             //Default value.
             next.ExtrapolationState = TransformData.ExtrapolateState.Disabled;
 
-            
-        }
+            }
 
         /// <summary>
         /// Updates a client with transform data.
@@ -2224,7 +2239,7 @@ private void DataReceived(ArraySegment<byte> data, Channel channel, bool asServe
             UpdateTransformData(data, prevTd, nextTd, ref changedFull);
 
             OnDataReceived?.Invoke(prevTd, nextTd);
-            SetExtrapolation(prevTd, nextTd, channel);
+            SetExtrapolatedData(prevTd, nextTd, channel);
 
             bool hasChanged = HasChanged(prevTd, nextTd);
 

Assets/FishNet/Runtime/Generated/Component/Utility/BandwidthDisplay.cs

@@ -239,7 +239,7 @@ private void NetworkTrafficStatistics_OnNetworkTraffic(uint tick, BidirectionalN
         {
             if (!_initialized)
                 return;
-            
+ 
             ServerAverages.AddIn(serverTraffic.InboundTraffic.Bytes);
             ServerAverages.AddOut(serverTraffic.OutboundTraffic.Bytes);
 
@@ -252,7 +252,7 @@ private void NetworkTrafficStatistics_OnNetworkTraffic(uint tick, BidirectionalN
 
             string nl = System.Environment.NewLine;
             string result = string.Empty;
-
+            
             if (_showIncoming)
                 result += $"Server In: {NetworkTrafficStatistics.FormatBytesToLargest(ServerAverages.GetAverage(inAverage: true))}/s{nl}";
             if (_showOutgoing)

Assets/FishNet/Runtime/Managing/NetworkManager.cs

@@ -227,7 +227,7 @@ internal void SetBroadcastName<T>(ushort key) where T : struct, IBroadcast
         /// <summary>
         /// Version of this release.
         /// </summary>
-        public const string FISHNET_VERSION = "4.6.11";
+        public const string FISHNET_VERSION = "4.6.12";
         /// <summary>
         /// Maximum framerate allowed.
         /// </summary>

Assets/FishNet/Runtime/Managing/Statistic/NetworkTrafficStatistics.cs

@@ -143,16 +143,16 @@ private void TimeManager_OnPreTick()
              * the traffic stat fields are reset. Each listener should use
              * the MultiwayTrafficCollection.Clone method to get a copy,
              * and should cache that copy when done. */
-            _clientTraffic.ResetState();
-            _serverTraffic.ResetState();
+            _clientTraffic.Reinitialize();
+            _serverTraffic.Reinitialize();
         }
 
         /// <summary>
         /// Called when a packet bundle is received. This is any number of packets bundled into a single transmission.
         /// </summary>
         internal void PacketBundleReceived(bool asServer)
         {
-            Debug.LogError("Inbound and outbound bidirection datas should count up how many packet bundles are received. This is so the bundle headers can be calculated appropriately.");
+            //Debug.LogError("Inbound and outbound bidirection datas should count up how many packet bundles are received. This is so the bundle headers can be calculated appropriately.");
         }
 
         /// <summary>
@@ -186,7 +186,7 @@ internal void AddInboundPacketIdData(PacketId typeSource, string details, int by
         {
             if (bytes <= 0)
                 return;
-
+ 
             GetBidirectionalNetworkTraffic(asServer).InboundTraffic.AddPacketIdData(typeSource, details, (ulong)bytes, gameObject);
         }
 

Assets/FishNet/Runtime/Plugins/ColliderRollback/Scripts/RollbackManager.cs

@@ -78,32 +78,27 @@ internal void InitializeOnce_Internal(NetworkManager manager)
         [Obsolete("Use Rollback(Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics, bool) instead.")] //Remove on V5
         public void Rollback(Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(Scene, Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics, bool) instead.")] //Remove on V5
         public void Rollback(Scene scene, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(int, Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics, bool) instead.")] //Remove on V5
         public void Rollback(int sceneHandle, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(Scene, Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics2D, bool) instead.")] //Remove on V5
         public void Rollback(Scene scene, Vector2 origin, Vector2 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics2D, bool) instead.")] //Remove on V5
         public void Rollback(Vector2 origin, Vector2 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back all colliders.
@@ -113,8 +108,7 @@ public void Rollback(Vector2 origin, Vector2 normalizedDirection, float distance
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back all colliders in a scene.
@@ -125,8 +119,7 @@ public void Rollback(PreciseTick pt, RollbackPhysicsType physicsType, bool asOwn
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(Scene scene, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back all colliders in a scene.
@@ -137,8 +130,7 @@ public void Rollback(Scene scene, PreciseTick pt, RollbackPhysicsType physicsTyp
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(int sceneHandle, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back colliders hit by a test cast against bounding boxes.
@@ -151,8 +143,7 @@ public void Rollback(int sceneHandle, PreciseTick pt, RollbackPhysicsType physic
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back colliders hit by a test cast against bounding boxes, in a specific scene.
@@ -166,8 +157,7 @@ public void Rollback(Vector3 origin, Vector3 normalizedDirection, float distance
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(Scene scene, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back colliders hit by a test cast against bounding boxes, in a specific scene.
@@ -181,19 +171,14 @@ public void Rollback(Scene scene, Vector3 origin, Vector3 normalizedDirection, f
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(int sceneHandle, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
-
-        
+            }
 
         /// <summary>
         /// Returns all ColliderRollback objects back to their original position.
         /// </summary>
         public void Return()
         {
-            
-        }
+            }
 
-        
-    }
+        }
 }

Assets/FishNet/Runtime/Plugins/Yak/Core/ClientSocket.cs

@@ -28,25 +28,15 @@ internal bool StartConnection()
             return true;
         }
 
-        
-
         /// <summary>
         /// Stops the local socket.
         /// </summary>
         internal bool StopConnection()
         {
-            
             return true;
         }
 
-        
-
-        
-
-        
-
         #region Local server.
-        
         #endregion
     }
 }