reverting change to move to a separate PR

Author: SamuelBellomo

com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs

@@ -13,6 +13,7 @@
 using MLAPI.Serialization;
 using MLAPI.Serialization.Pooled;
 using MLAPI.Transports;
+using Unity.Profiling;
 
 namespace MLAPI
 {
@@ -296,6 +297,11 @@ protected NetworkBehaviour GetNetworkBehaviour(ushort behaviourId)
         /// </summary>
         public ulong OwnerClientId => NetworkObject.OwnerClientId;
 
+        /// <summary>
+        /// Stores the network tick at the NetworkBehaviourUpdate time
+        /// This allows sending NetworkVariables not more often than once per network tick, regardless of the update rate
+        /// </summary>
+        public static ushort CurrentTick { get; private set; }
 
         /// <summary>
         /// Gets called when message handlers are ready to be registered and the network is setup
@@ -347,6 +353,7 @@ public virtual void OnNetworkObjectParentChanged(NetworkObject parentNetworkObje
         private readonly List<NetworkChannel> m_ChannelsForNetworkVariableGroups = new List<NetworkChannel>();
         internal readonly List<INetworkVariable> NetworkVariableFields = new List<INetworkVariable>();
 
+        private static HashSet<NetworkObject> s_Touched = new HashSet<NetworkObject>();
         private static Dictionary<Type, FieldInfo[]> s_FieldTypes = new Dictionary<Type, FieldInfo[]>();
 
         private static FieldInfo[] GetFieldInfoForType(Type type)
@@ -439,6 +446,83 @@ internal void InitializeVariables()
             }
         }
 
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+        private static ProfilerMarker s_NetworkBehaviourUpdate = new ProfilerMarker($"{nameof(NetworkBehaviour)}.{nameof(NetworkBehaviourUpdate)}");
+#endif
+
+        internal static void NetworkBehaviourUpdate(NetworkManager networkManager)
+        {
+            // Do not execute NetworkBehaviourUpdate more than once per network tick
+            ushort tick = networkManager.NetworkTickSystem.GetTick();
+            if (tick == CurrentTick)
+            {
+                return;
+            }
+
+            CurrentTick = tick;
+
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+            s_NetworkBehaviourUpdate.Begin();
+#endif
+            try
+            {
+                if (networkManager.IsServer)
+                {
+                    s_Touched.Clear();
+                    for (int i = 0; i < networkManager.ConnectedClientsList.Count; i++)
+                    {
+                        var client = networkManager.ConnectedClientsList[i];
+                        var spawnedObjs = networkManager.SpawnManager.SpawnedObjectsList;
+                        s_Touched.UnionWith(spawnedObjs);
+                        foreach (var sobj in spawnedObjs)
+                        {
+                            // Sync just the variables for just the objects this client sees
+                            for (int k = 0; k < sobj.ChildNetworkBehaviours.Count; k++)
+                            {
+                                sobj.ChildNetworkBehaviours[k].VariableUpdate(client.ClientId);
+                            }
+                        }
+                    }
+
+                    // Now, reset all the no-longer-dirty variables
+                    foreach (var sobj in s_Touched)
+                    {
+                        for (int k = 0; k < sobj.ChildNetworkBehaviours.Count; k++)
+                        {
+                            sobj.ChildNetworkBehaviours[k].PostNetworkVariableWrite();
+                        }
+                    }
+                }
+                else
+                {
+                    // when client updates the sever, it tells it about all its objects
+                    foreach (var sobj in networkManager.SpawnManager.SpawnedObjectsList)
+                    {
+                        for (int k = 0; k < sobj.ChildNetworkBehaviours.Count; k++)
+                        {
+                            sobj.ChildNetworkBehaviours[k].VariableUpdate(networkManager.ServerClientId);
+                        }
+                    }
+
+                    // Now, reset all the no-longer-dirty variables
+                    foreach (var sobj in networkManager.SpawnManager.SpawnedObjectsList)
+                    {
+                        for (int k = 0; k < sobj.ChildNetworkBehaviours.Count; k++)
+                        {
+                            sobj.ChildNetworkBehaviours[k].PostNetworkVariableWrite();
+                        }
+                    }
+                }
+            }
+            finally
+            {
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+                s_NetworkBehaviourUpdate.End();
+#endif
+            }
+        }
+
+
         internal void PreNetworkVariableWrite()
         {
             // reset our "which variables got written" data

com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs

@@ -59,7 +59,6 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTr
         internal NetworkTickSystem NetworkTickSystem { get; private set; }
 
         internal SnapshotSystem SnapshotSystem { get; private set; }
-        internal NetworkBehaviourUpdater BehaviourUpdater { get; private set; }
 
         private NetworkPrefabHandler m_PrefabHandler;
         public NetworkPrefabHandler PrefabHandler
@@ -349,8 +348,6 @@ private void Initialize(bool server)
 
             SceneManager = new NetworkSceneManager(this);
 
-            BehaviourUpdater = new NetworkBehaviourUpdater();
-
             // Only create this if it's not already set (like in test cases)
             MessageHandler ??= CreateMessageHandler();
 
@@ -847,11 +844,6 @@ public void Shutdown()
                 CustomMessagingManager = null;
             }
 
-            if (BehaviourUpdater != null)
-            {
-                BehaviourUpdater = null;
-            }
-
             //The Transport is set during Init time, thus it is possible for the Transport to be null
             NetworkConfig?.NetworkTransport?.Shutdown();
         }
@@ -939,7 +931,7 @@ private void OnNetworkPreUpdate()
                     if (NetworkConfig.EnableNetworkVariable)
                     {
                         // Do NetworkVariable updates
-                        BehaviourUpdater.NetworkBehaviourUpdate(this);
+                        NetworkBehaviour.NetworkBehaviourUpdate(this);
                     }
 
                     if (!IsServer && NetworkConfig.EnableMessageBuffering)