fix: PlayerSpawner depends on ClientObjectManager throw if missing (#472

) * fix: PlayerSpawner depends on ClientObjectManager throw if missing * add test
MirageNet · Nov 3, 2020 · 0ab0a70 · 0ab0a70
1 parent 2d3a358
commit 0ab0a70
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/Assets/Mirror/Runtime/PlayerSpawner.cs b/Assets/Mirror/Runtime/PlayerSpawner.cs
@@ -30,7 +30,13 @@ public virtual void Start()
             {
                 sceneManager.ClientSceneChanged.AddListener(OnClientSceneChanged);
                 if(clientObjectManager != null)
+                {
                     clientObjectManager.RegisterPrefab(playerPrefab.gameObject);
+                }
+                else
+                {
+                    throw new InvalidOperationException("Assign a ClientObjectManager");
+                }
             }
             if (server != null)
             {

diff --git a/Assets/Tests/Editor/PlayerSpawnerTest.cs b/Assets/Tests/Editor/PlayerSpawnerTest.cs
@@ -39,6 +39,7 @@ public void Setup()
             spawner.client = client;
             spawner.server = server;
             spawner.serverObjectManager = serverObjectManager;
+            spawner.clientObjectManager = clientObjectManager;
 
             playerPrefab = new GameObject();
             NetworkIdentity playerId = playerPrefab.AddComponent<NetworkIdentity>();
@@ -124,5 +125,15 @@ public void GetStartPositionNullTest()
             spawner.startPositions.Clear();
             Assert.That(spawner.GetStartPosition(), Is.SameAs(null));
         }
+
+        [Test]
+        public void MissingClientObjectSpawnerExceptionTest()
+        {
+            spawner.clientObjectManager = null;
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                spawner.Start();
+            });
+        }
     }
 }