Cleanup unneeded changes

Author: EmandM

com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs

@@ -2038,7 +2038,6 @@ internal void SynchronizeNetworkObjects(ulong clientId, bool synchronizingServic
                 // If we are just a normal client and in distributed authority mode, then always use the known server scene handle
                 if (NetworkManager.DistributedAuthorityMode && NetworkManager.CMBServiceConnection)
                 {
-                    Debug.Log($"[Client-{NetworkManager.LocalClientId}] Adding scene to synchronize: {scene.name}");
                     sceneEventData.AddSceneToSynchronize(SceneHashFromNameOrPath(scene.path), ClientSceneHandleToServerSceneHandle[scene.handle]);
                 }
                 else

com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using Unity.Collections;
-using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace Unity.Netcode
@@ -588,7 +587,6 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
             // Write the scenes we want to load, in the order we want to load them
             writer.WriteValueSafe(ScenesToSynchronize.ToArray());
             writer.WriteValueSafe(SceneHandlesToSynchronize.ToArray());
-            Debug.Log($"[Client-1][WriteSceneSynchronizationData] ScenesToSynchronize={ScenesToSynchronize.Count}, SceneHandlesToSynchronize={SceneHandlesToSynchronize.Count}");
             // Store our current position in the stream to come back and say how much data we have written
             var positionStart = writer.Position;
 
@@ -784,7 +782,7 @@ internal void Deserialize(FastBufferReader reader)
                         {
                             LogArray(reader.ToArray(), 0, reader.Length);
                         }
-                        CopySceneSynchronizationData(reader, TargetClientId);
+                        CopySceneSynchronizationData(reader);
                         IsStartingSynchronization = true;
                         break;
                     }
@@ -827,14 +825,13 @@ internal void Deserialize(FastBufferReader reader)
         /// into the internal buffer to be used throughout the synchronization process.
         /// </summary>
         /// <param name="reader"></param>
-        internal void CopySceneSynchronizationData(FastBufferReader reader, ulong targetClientId)
+        internal void CopySceneSynchronizationData(FastBufferReader reader)
         {
             m_NetworkObjectsSync.Clear();
             reader.ReadValueSafe(out uint[] scenesToSynchronize);
             reader.ReadValueSafe(out NetworkSceneHandle[] sceneHandlesToSynchronize);
             ScenesToSynchronize = new Queue<uint>(scenesToSynchronize);
             SceneHandlesToSynchronize = new Queue<NetworkSceneHandle>(sceneHandlesToSynchronize);
-            Debug.Log($"[Client-{targetClientId}] CopySceneSynchronizationData! ScenesToSynchronize={ScenesToSynchronize.Count}, SceneHandlesToSynchronize={SceneHandlesToSynchronize.Count}");
 
 
             // is not packed!

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs

@@ -1164,7 +1164,7 @@ protected virtual void OnTimeTravelServerAndClientsConnected()
         private void ClientNetworkManagerPostStart(NetworkManager networkManager)
         {
             networkManager.name = $"NetworkManager - Client - {networkManager.LocalClientId}";
-            Assert.NotNull(networkManager.LocalClient.PlayerObject, $"{nameof(StartServerAndClients)} detected that Client-{networkManager.LocalClientId} does not have an assigned player NetworkObject!");
+            Assert.NotNull(networkManager.LocalClient.PlayerObject, $"{nameof(StartServerAndClients)} detected that client {networkManager.LocalClientId} does not have an assigned player NetworkObject!");
 
             // Go ahead and create an entry for this new client
             if (!m_PlayerNetworkObjects.ContainsKey(networkManager.LocalClientId))
@@ -1252,21 +1252,14 @@ protected virtual bool ShouldCheckForSpawnedPlayers()
         /// the session owner.
         /// </remarks>
         /// <returns><see cref="IEnumerator"/></returns>
-        private IEnumerator StartSessionOwner(NetworkManager networkManager, bool ignoreSessionOwnerCheck = false)
+        private IEnumerator StartSessionOwner()
         {
             VerboseDebug("Starting session owner...");
-            NetcodeIntegrationTestHelpers.StartOneClient(networkManager);
-            if (!ignoreSessionOwnerCheck)
-            {
-                yield return WaitForConditionOrTimeOut(() => networkManager.IsConnectedClient);
-                AssertOnTimeout($"Timed out waiting for the session owner to connect to CMB Server!");
-                Assert.True(networkManager.LocalClient.IsSessionOwner, $"Client-{networkManager.LocalClientId} started session but was not set to be the session owner!");
-                VerboseDebug("Session owner connected and approved.");
-            }
-            else
-            {
-                yield return k_DefaultTickRate;
-            }
+            NetcodeIntegrationTestHelpers.StartOneClient(m_ClientNetworkManagers[0]);
+            yield return WaitForConditionOrTimeOut(() => m_ClientNetworkManagers[0].IsConnectedClient);
+            AssertOnTimeout($"Timed out waiting for the session owner to connect to CMB Server!");
+            Assert.True(m_ClientNetworkManagers[0].LocalClient.IsSessionOwner, $"Client-{m_ClientNetworkManagers[0].LocalClientId} started session but was not set to be the session owner!");
+            VerboseDebug("Session owner connected and approved.");
         }
 
         /// <summary>
@@ -1285,44 +1278,19 @@ protected IEnumerator StartServerAndClients()
                 if (m_UseCmbService)
                 {
                     VerboseDebug("Using a distributed authority CMB Server for connection.");
-                    yield return StartSessionOwner(m_ClientNetworkManagers[0]);
-                }
-
-                for (int i = 1; i < m_ClientNetworkManagers.Length; i++)
-                {
-                    yield return StartSessionOwner(m_ClientNetworkManagers[i], true);
+                    yield return StartSessionOwner();
                 }
 
                 // Start the instances and pass in our SceneManagerInitialization action that is invoked immediately after host-server
                 // is started and after each client is started.
-                // if (!NetcodeIntegrationTestHelpers.Start(m_UseHost, !m_UseCmbService, m_ServerNetworkManager, m_ClientNetworkManagers))
-                // {
-                //     Debug.LogError("Failed to start instances");
-                //     Assert.Fail("Failed to start instances");
-                // }
+                if (!NetcodeIntegrationTestHelpers.Start(m_UseHost, !m_UseCmbService, m_ServerNetworkManager, m_ClientNetworkManagers))
+                {
+                    Debug.LogError("Failed to start instances");
+                    Assert.Fail("Failed to start instances");
+                }
 
                 // Get the authority NetworkMananger (Server, Host, or Session Owner)
                 var authorityManager = GetAuthorityNetworkManager();
-                // var authorityPrefabs = authorityManager.NetworkConfig.Prefabs.NetworkPrefabsLists[0].List;
-                foreach (var manager in m_NetworkManagers)
-                {
-                    if (manager == authorityManager)
-                    {
-                        continue;
-                    }
-
-                    Assert.That(authorityManager.NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash, Is.EqualTo(manager.NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash));
-
-                    // if (authorityManager.NetworkConfig.Prefabs.NetworkPrefabsLists.Count > 1)
-                    // {
-                    //     var clientList = manager.NetworkConfig.Prefabs.NetworkPrefabsLists[0].List;
-                    //     Assert.That(clientList.Count, Is.EqualTo(authorityPrefabs.Count));
-                    //     for (int i = 0; i < authorityPrefabs.Count; i++)
-                    //     {
-                    //         Assert.That(clientList[i].Prefab.GetComponent<NetworkObject>().GlobalObjectIdHash, Is.EqualTo(authorityPrefabs[i].Prefab.GetComponent<NetworkObject>().GlobalObjectIdHash));
-                    //     }
-                    // }
-                }
 
                 // When scene management is enabled, we need to re-apply the scenes populated list since we have overriden the ISceneManagerHandler
                 // imeplementation at this point. This assures any pre-loaded scenes will be automatically assigned to the server and force clients