Merge branch 'sam/feature/interpolation-for-network-transform' of github.com:Unity-Technologies/com.unity.multiplayer.mlapi into sam/feature/interpolation-for-network-transform

* 'sam/feature/interpolation-for-network-transform' of github.com:Unity-Technologies/com.unity.multiplayer.mlapi:
  fix: networkscenemanager not releasing buffers from pool (#1132)
  test: fixed-length strings in netvars (#1119)
  fix: snapshot system. last fixes for release (#1129)
  refactor!: Unified Shutdown (#1108)
  chore: Fill out unity project for integration test project (#1128)
  feat: make ServerRpc ownership check an error log instead of warning log (#1126)

Author: SamuelBellomo

com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs

@@ -78,7 +78,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)
             return new ILPostProcessResult(new InMemoryAssembly(pe.ToArray(), pdb.ToArray()), m_Diagnostics);
         }
 
-        private MethodReference m_Debug_LogWarning_MethodRef;
+        private MethodReference m_Debug_LogError_MethodRef;
         private TypeReference m_NetworkManager_TypeRef;
         private MethodReference m_NetworkManager_getLocalClientId_MethodRef;
         private MethodReference m_NetworkManager_getIsListening_MethodRef;
@@ -150,7 +150,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)
         private MethodReference m_NetworkSerializer_SerializeRayArray_MethodRef;
         private MethodReference m_NetworkSerializer_SerializeRay2DArray_MethodRef;
 
-        private const string k_Debug_LogWarning = nameof(Debug.LogWarning);
+        private const string k_Debug_LogError = nameof(Debug.LogError);
         private const string k_NetworkManager_LocalClientId = nameof(NetworkManager.LocalClientId);
         private const string k_NetworkManager_IsListening = nameof(NetworkManager.IsListening);
         private const string k_NetworkManager_IsHost = nameof(NetworkManager.IsHost);
@@ -182,10 +182,10 @@ private bool ImportReferences(ModuleDefinition moduleDefinition)
             {
                 switch (methodInfo.Name)
                 {
-                    case k_Debug_LogWarning:
+                    case k_Debug_LogError:
                         if (methodInfo.GetParameters().Length == 1)
                         {
-                            m_Debug_LogWarning_MethodRef = moduleDefinition.ImportReference(methodInfo);
+                            m_Debug_LogError_MethodRef = moduleDefinition.ImportReference(methodInfo);
                         }
 
                         break;
@@ -830,9 +830,9 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
                         instructions.Add(processor.Create(OpCodes.Ceq));
                         instructions.Add(processor.Create(OpCodes.Brfalse, logNextInstr));
 
-                        // Debug.LogWarning(...);
+                        // Debug.LogError(...);
                         instructions.Add(processor.Create(OpCodes.Ldstr, "Only the owner can invoke a ServerRpc that requires ownership!"));
-                        instructions.Add(processor.Create(OpCodes.Call, m_Debug_LogWarning_MethodRef));
+                        instructions.Add(processor.Create(OpCodes.Call, m_Debug_LogError_MethodRef));
 
                         instructions.Add(logNextInstr);
 
@@ -1827,9 +1827,9 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
                 processor.Emit(OpCodes.Ceq);
                 processor.Emit(OpCodes.Brfalse, logNextInstr);
 
-                // Debug.LogWarning(...);
+                // Debug.LogError(...);
                 processor.Emit(OpCodes.Ldstr, "Only the owner can invoke a ServerRpc that requires ownership!");
-                processor.Emit(OpCodes.Call, m_Debug_LogWarning_MethodRef);
+                processor.Emit(OpCodes.Call, m_Debug_LogError_MethodRef);
 
                 processor.Append(logNextInstr);
 

com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs

@@ -352,18 +352,7 @@ public override void OnInspectorGUI()
 
                 if (GUILayout.Button(new GUIContent("Stop " + instanceType, "Stops the " + instanceType + " instance.")))
                 {
-                    if (m_NetworkManager.IsHost)
-                    {
-                        m_NetworkManager.StopHost();
-                    }
-                    else if (m_NetworkManager.IsServer)
-                    {
-                        m_NetworkManager.StopServer();
-                    }
-                    else if (m_NetworkManager.IsClient)
-                    {
-                        m_NetworkManager.StopClient();
-                    }
+                    m_NetworkManager.Shutdown();
                 }
             }
         }

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

@@ -726,94 +726,6 @@ public SocketTasks StartClient()
             return socketTasks;
         }
 
-        /// <summary>
-        /// Stops the running server
-        /// </summary>
-        public void StopServer()
-        {
-            if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
-            {
-                NetworkLog.LogInfo(nameof(StopServer));
-            }
-
-            var disconnectedIds = new HashSet<ulong>();
-
-            //Don't know if I have to disconnect the clients. I'm assuming the NetworkTransport does all the cleaning on shtudown. But this way the clients get a disconnect message from server (so long it does't get lost)
-
-            // make sure all messages are flushed before transport disconnect clients
-            if (MessageQueueContainer != null)
-            {
-                MessageQueueContainer.ProcessAndFlushMessageQueue(
-                    queueType: MessageQueueContainer.MessageQueueProcessingTypes.Send,
-                    NetworkUpdateStage.PostLateUpdate); // flushing messages in case transport's disconnect
-            }
-
-            foreach (KeyValuePair<ulong, NetworkClient> pair in ConnectedClients)
-            {
-                if (!disconnectedIds.Contains(pair.Key))
-                {
-                    disconnectedIds.Add(pair.Key);
-
-                    if (pair.Key == NetworkConfig.NetworkTransport.ServerClientId)
-                    {
-                        continue;
-                    }
-
-                    NetworkConfig.NetworkTransport.DisconnectRemoteClient(pair.Key);
-                }
-            }
-
-            foreach (KeyValuePair<ulong, PendingClient> pair in PendingClients)
-            {
-                if (!disconnectedIds.Contains(pair.Key))
-                {
-                    disconnectedIds.Add(pair.Key);
-                    if (pair.Key == NetworkConfig.NetworkTransport.ServerClientId)
-                    {
-                        continue;
-                    }
-
-                    NetworkConfig.NetworkTransport.DisconnectRemoteClient(pair.Key);
-                }
-            }
-
-            IsServer = false;
-            Shutdown();
-        }
-
-        /// <summary>
-        /// Stops the running host
-        /// </summary>
-        public void StopHost()
-        {
-            if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
-            {
-                NetworkLog.LogInfo(nameof(StopHost));
-            }
-
-            IsServer = false;
-            IsClient = false;
-            StopServer();
-
-            //We don't stop client since we dont actually have a transport connection to our own host. We just handle host messages directly in the netcode
-        }
-
-        /// <summary>
-        /// Stops the running client
-        /// </summary>
-        public void StopClient()
-        {
-            if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
-            {
-                NetworkLog.LogInfo(nameof(StopClient));
-            }
-
-            IsClient = false;
-            NetworkConfig.NetworkTransport.DisconnectLocalClient();
-            IsConnectedClient = false;
-            Shutdown();
-        }
-
         /// <summary>
         /// Starts a Host
         /// </summary>
@@ -942,13 +854,71 @@ private void OnDestroy()
             }
         }
 
+        /// <summary>
+        /// Globally shuts down the library.
+        /// Disconnects clients if connected and stops server if running.
+        /// </summary>
         public void Shutdown()
         {
             if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
             {
                 NetworkLog.LogInfo(nameof(Shutdown));
             }
 
+            if (IsServer)
+            {
+                // make sure all messages are flushed before transport disconnect clients
+                if (MessageQueueContainer != null)
+                {
+                    MessageQueueContainer.ProcessAndFlushMessageQueue(
+                        queueType: MessageQueueContainer.MessageQueueProcessingTypes.Send,
+                        NetworkUpdateStage.PostLateUpdate); // flushing messages in case transport's disconnect
+                }
+
+                var disconnectedIds = new HashSet<ulong>();
+
+                //Don't know if I have to disconnect the clients. I'm assuming the NetworkTransport does all the cleaning on shutdown. But this way the clients get a disconnect message from server (so long it does't get lost)
+
+                foreach (KeyValuePair<ulong, NetworkClient> pair in ConnectedClients)
+                {
+                    if (!disconnectedIds.Contains(pair.Key))
+                    {
+                        disconnectedIds.Add(pair.Key);
+
+                        if (pair.Key == NetworkConfig.NetworkTransport.ServerClientId)
+                        {
+                            continue;
+                        }
+
+                        NetworkConfig.NetworkTransport.DisconnectRemoteClient(pair.Key);
+                    }
+                }
+
+                foreach (KeyValuePair<ulong, PendingClient> pair in PendingClients)
+                {
+                    if (!disconnectedIds.Contains(pair.Key))
+                    {
+                        disconnectedIds.Add(pair.Key);
+                        if (pair.Key == NetworkConfig.NetworkTransport.ServerClientId)
+                        {
+                            continue;
+                        }
+
+                        NetworkConfig.NetworkTransport.DisconnectRemoteClient(pair.Key);
+                    }
+                }
+            }
+
+            if (IsClient)
+            {
+                // Client only, send disconnect to server
+                NetworkConfig.NetworkTransport.DisconnectLocalClient();
+            }
+
+            IsConnectedClient = false;
+            IsServer = false;
+            IsClient = false;
+
             // Unregister INetworkUpdateSystem before shutting down the MessageQueueContainer
             this.UnregisterAllNetworkUpdates();
 
@@ -971,8 +941,6 @@ public void Shutdown()
                 NetworkTickSystem = null;
             }
 
-            IsServer = false;
-            IsClient = false;
             NetworkConfig.NetworkTransport.OnTransportEvent -= HandleRawTransportPoll;
 
             if (SpawnManager != null)
@@ -985,6 +953,8 @@ public void Shutdown()
 
             if (SceneManager != null)
             {
+                // Let the NetworkSceneManager clean up its two SceneEvenData instances
+                SceneManager.Dispose();
                 SceneManager = null;
             }
 
@@ -1203,8 +1173,7 @@ private void HandleRawTransportPoll(NetworkEvent networkEvent, ulong clientId, N
                     }
                     else
                     {
-                        IsConnectedClient = false;
-                        StopClient();
+                        Shutdown();
                     }
 
                     OnClientDisconnectCallback?.Invoke(clientId);

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -394,17 +394,15 @@ private void OnDestroy()
 
         private SnapshotDespawnCommand GetDespawnCommand()
         {
-            SnapshotDespawnCommand command;
+            var command = new SnapshotDespawnCommand();
             command.NetworkObjectId = NetworkObjectId;
-            command.TickWritten = default; // value will be set internally by SnapshotSystem
-            command.TargetClientIds = default;
 
             return command;
         }
 
         private SnapshotSpawnCommand GetSpawnCommand()
         {
-            SnapshotSpawnCommand command;
+            var command = new SnapshotSpawnCommand();
             command.NetworkObjectId = NetworkObjectId;
             command.OwnerClientId = OwnerClientId;
             command.IsPlayerObject = IsPlayerObject;
@@ -426,8 +424,6 @@ private SnapshotSpawnCommand GetSpawnCommand()
             command.ObjectPosition = transform.position;
             command.ObjectRotation = transform.rotation;
             command.ObjectScale = transform.localScale;
-            command.TickWritten = default; // value will be set internally by SnapshotSystem
-            command.TargetClientIds = default;
 
             return command;
         }