feat: adding option to ignore character check for spawning objects

MirageNet · Sep 8, 2021 · 9234eb4 · 9234eb4
1 parent c76e081
commit 9234eb4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Assets/Mirage/Runtime/ServerObjectManager.cs b/Assets/Mirage/Runtime/ServerObjectManager.cs
@@ -665,12 +665,20 @@ public void SpawnObjects()
         /// </para>
         /// </summary>
         /// <param name="player">The player to spawn objects for</param>
-        public void SpawnVisibleObjects(INetworkPlayer player)
+        public void SpawnVisibleObjects(INetworkPlayer player) => SpawnVisibleObjects(player, false);
+
+        /// <summary>
+        /// Sends spawn message for scene objects and other visible objects to the given player if it has a character
+        /// </summary>
+        /// <param name="player">The player to spawn objects for</param>
+        /// <param name="ignoreHasCharacter">If true will spawn visibile objects even if player does not have a spawned character yet</param>
+        // note: can't use optional param here because we need just NetworkPlayer version for event
+        public void SpawnVisibleObjects(INetworkPlayer player, bool ignoreHasCharacter)
         {
             if (logger.LogEnabled()) logger.Log("SetClientReadyInternal for conn:" + player);
 
             // client is ready to start spawning objects
-            if (player.HasCharacter)
+            if (ignoreHasCharacter || player.HasCharacter)
                 SpawnVisibleObjectForPlayer(player);
         }
     }

diff --git a/Assets/Tests/Performance/Runtime/HeadlessBenchmark/Scripts/HeadlessBenchmark.cs b/Assets/Tests/Performance/Runtime/HeadlessBenchmark/Scripts/HeadlessBenchmark.cs
@@ -118,7 +118,7 @@ void ParseForServerMode()
             spawner.Server = server;
 
             server.Started.AddListener(OnServerStarted);
-            server.Authenticated.AddListener(conn => serverObjectManager.SpawnVisibleObjects(conn));
+            server.Authenticated.AddListener(conn => serverObjectManager.SpawnVisibleObjects(conn, true));
             server.StartServer();
             Console.WriteLine("Starting Server Only Mode");
         }

diff --git a/Assets/Tests/Performance/Runtime/MultipleClients/MultipleClients.cs b/Assets/Tests/Performance/Runtime/MultipleClients/MultipleClients.cs
@@ -44,7 +44,7 @@ public class MultipleClients
             Server = Object.FindObjectOfType<NetworkServer>();
             ServerObjectManager = Object.FindObjectOfType<ServerObjectManager>();
 
-            Server.Authenticated.AddListener(conn => ServerObjectManager.SpawnVisibleObjects(conn));
+            Server.Authenticated.AddListener(conn => ServerObjectManager.SpawnVisibleObjects(conn, true));
 
             var started = new UniTaskCompletionSource();
             Server.Started.AddListener(() => started.TrySetResult());

diff --git a/Assets/Tests/Runtime/Host/PlayerSceneReadyHostTests.cs b/Assets/Tests/Runtime/Host/PlayerSceneReadyHostTests.cs
@@ -13,8 +13,6 @@ public void SetClientReadyAndNotReadyTest()
 
             sceneManager.SetClientNotReady(connection);
             Assert.That(connection.SceneIsReady, Is.False);
-
-
         }
 
         [Test]