refactor: moving ready methods to NetworkSceneManager

BREAKING CHANGE: moving SetAllClientsNotReady and SetClientNotReady from ServerObjectManager to NetworkSceneManager

Assets/Mirage/Runtime/NetworkSceneManager.cs

@@ -340,6 +340,7 @@ public void SetSceneIsReady()
             // Let server prepare for scene change
             logger.Log("[NetworkSceneManager] - OnServerChangeScene");
 
+            SetAllClientsNotReady();
             OnServerStartedSceneChange?.Invoke(scenePath, sceneOperation);
 
             if (players == null)
@@ -378,6 +379,7 @@ private void ServerSceneUnLoading(Scene scene, IEnumerable<INetworkPlayer> playe
             // Let server prepare for scene change
             if (logger.LogEnabled()) logger.Log("[NetworkSceneManager] - OnServerChangeScene");
 
+            SetAllClientsNotReady();
             OnServerStartedSceneChange?.Invoke(scene.path, SceneOperation.UnloadAdditive);
 
             // if not host
@@ -495,6 +497,39 @@ protected internal virtual void OnServerPlayerDisconnected(INetworkPlayer discon
             }
         }
 
+        /// <summary>
+        /// Marks all connected clients as no longer ready.
+        /// <para>
+        ///     All clients will no longer be sent state synchronization updates.
+        ///     The player's clients can call ClientManager.Ready() again to re-enter the ready state.
+        ///     This is useful when switching scenes.
+        /// </para>
+        /// </summary>
+        public void SetAllClientsNotReady()
+        {
+            foreach (INetworkPlayer player in Server.Players)
+            {
+                SetClientNotReady(player);
+            }
+        }
+
+        /// <summary>
+        /// Sets the client of the connection to be not-ready.
+        /// <para>Clients that are not ready do not receive spawned objects or state synchronization updates. They client can be made ready again by calling SetClientReady().</para>
+        /// </summary>
+        /// <param name="player">The connection of the client to make not ready.</param>
+        public void SetClientNotReady(INetworkPlayer player)
+        {
+            if (player.SceneIsReady)
+            {
+                if (logger.LogEnabled()) logger.Log("PlayerNotReady " + player);
+                player.SceneIsReady = false;
+                player.RemoveAllVisibleObjects();
+
+                player.Send(new SceneNotReadyMessage());
+            }
+        }
+
         #endregion
 
         #region Scene Operations

Assets/Mirage/Runtime/ServerObjectManager.cs

@@ -59,7 +59,6 @@ public void Start()
 
                 if (NetworkSceneManager != null)
                 {
-                    NetworkSceneManager.OnServerStartedSceneChange.AddListener(OnStartedSceneChange);
                     NetworkSceneManager.OnServerFinishedSceneChange.AddListener(OnFinishedSceneChange);
                 }
             }
@@ -91,11 +90,6 @@ void OnServerStopped()
             nextNetworkId = 1;
         }
 
-        void OnStartedSceneChange(string scenePath, SceneOperation sceneOperation)
-        {
-            SetAllClientsNotReady();
-        }
-
         void OnFinishedSceneChange(string scenePath, SceneOperation sceneOperation)
         {
             SpawnOrActivate();
@@ -674,34 +668,6 @@ public void SpawnVisibleObjects(INetworkPlayer player)
                 SpawnObserversForConnection(player);
         }
 
-        /// <summary>
-        /// Marks all connected clients as no longer ready.
-        /// <para>All clients will no longer be sent state synchronization updates. The player's clients can call ClientManager.Ready() again to re-enter the ready state. This is useful when switching scenes.</para>
-        /// </summary>
-        public void SetAllClientsNotReady()
-        {
-            foreach (INetworkPlayer player in Server.Players)
-            {
-                SetClientNotReady(player);
-            }
-        }
-
-        /// <summary>
-        /// Sets the client of the connection to be not-ready.
-        /// <para>Clients that are not ready do not receive spawned objects or state synchronization updates. They client can be made ready again by calling SetClientReady().</para>
-        /// </summary>
-        /// <param name="player">The connection of the client to make not ready.</param>
-        public void SetClientNotReady(INetworkPlayer player)
-        {
-            if (player.SceneIsReady)
-            {
-                if (logger.LogEnabled()) logger.Log("PlayerNotReady " + player);
-                player.SceneIsReady = false;
-                player.RemoveAllVisibleObjects();
-
-                player.Send(new SceneNotReadyMessage());
-            }
-        }
 
         /// <summary>
         /// default ready handler. 

Assets/Tests/Runtime/Host/PlayerSceneReadyHostTests.cs

@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using static Mirage.Tests.LocalConnections;
+
+namespace Mirage.Tests.Runtime.Host
+{
+    public class PlayerSceneReadyHostTests : HostSetup<MockComponent>
+    {
+        [Test]
+        public void SetClientReadyAndNotReadyTest()
+        {
+            (_, NetworkPlayer connection) = PipedConnections(ClientMessageHandler, ServerMessageHandler);
+            Assert.That(connection.SceneIsReady, Is.False);
+
+            serverObjectManager.SpawnVisibleObjects(connection);
+            Assert.That(connection.SceneIsReady, Is.True);
+
+            sceneManager.SetClientNotReady(connection);
+            Assert.That(connection.SceneIsReady, Is.False);
+        }
+
+        [Test]
+        public void SetAllClientsNotReadyTest()
+        {
+            // add first ready client
+            (_, NetworkPlayer first) = PipedConnections(ClientMessageHandler, ServerMessageHandler);
+            first.SceneIsReady = true;
+            server.Players.Add(first);
+
+            // add second ready client
+            (_, NetworkPlayer second) = PipedConnections(ClientMessageHandler, ServerMessageHandler);
+            second.SceneIsReady = true;
+            server.Players.Add(second);
+
+            // set all not ready
+            sceneManager.SetAllClientsNotReady();
+            Assert.That(first.SceneIsReady, Is.False);
+            Assert.That(second.SceneIsReady, Is.False);
+        }
+    }
+}

Assets/Tests/Runtime/Host/ServerObjectManagerTest.cs

@@ -4,49 +4,13 @@
 using NUnit.Framework;
 using UnityEngine;
 using UnityEngine.TestTools;
-using static Mirage.Tests.LocalConnections;
 using Object = UnityEngine.Object;
 
 namespace Mirage.Tests.Runtime.Host
 {
-
     [TestFixture]
     public class ServerObjectManagerHostTest : HostSetup<MockComponent>
     {
-        [Test]
-        public void SetClientReadyAndNotReadyTest()
-        {
-            (_, NetworkPlayer connection) = PipedConnections(ClientMessageHandler, ServerMessageHandler);
-            Assert.That(connection.SceneIsReady, Is.False);
-
-            serverObjectManager.SpawnVisibleObjects(connection);
-            Assert.That(connection.SceneIsReady, Is.True);
-
-            serverObjectManager.SetClientNotReady(connection);
-            Assert.That(connection.SceneIsReady, Is.False);
-        }
-
-        [Test]
-        public void SetAllClientsNotReadyTest()
-        {
-            // add first ready client
-            (_, NetworkPlayer first) = PipedConnections(ClientMessageHandler, ServerMessageHandler);
-            first.SceneIsReady = true;
-            server.Players.Add(first);
-
-            // add second ready client
-            (_, NetworkPlayer second) = PipedConnections(ClientMessageHandler, ServerMessageHandler);
-            second.SceneIsReady = true;
-            server.Players.Add(second);
-
-            // set all not ready
-            serverObjectManager.SetAllClientsNotReady();
-            Assert.That(first.SceneIsReady, Is.False);
-            Assert.That(second.SceneIsReady, Is.False);
-        }
-
-
-
         [Test]
         public void HideForConnection()
         {