fix: fixing null ref when ObjectManager not set

ObjectManager is optional
MirageNet · May 5, 2023 · 7333749 · 7333749
1 parent 25058d9
commit 7333749
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Assets/Mirage/Runtime/NetworkClient.cs b/Assets/Mirage/Runtime/NetworkClient.cs
@@ -158,7 +158,8 @@ public void Connect(string address = null, ushort? port = null)
             InitializeAuthEvents();
 
             // invoke started event after everything is set up, but before peer has connected
-            ObjectManager.ClientStarted(this);
+            if (ObjectManager != null)
+                ObjectManager.ClientStarted(this);
             _started.Invoke();
         }
 
@@ -226,7 +227,8 @@ internal void ConnectHost(NetworkServer server, IDataHandler serverDataHandler)
             RegisterHostHandlers();
             InitializeAuthEvents();
             // invoke started event after everything is set up, but before peer has connected
-            ObjectManager.ClientStarted(this);
+            if (ObjectManager != null)
+                ObjectManager.ClientStarted(this);
             _started.Invoke();
 
             // we need add server connection to server's dictionary first

diff --git a/Assets/Mirage/Runtime/NetworkServer.cs b/Assets/Mirage/Runtime/NetworkServer.cs
@@ -285,7 +285,8 @@ public void StartServer(NetworkClient localClient = null)
             Active = true;
             // make sure to call ServerObjectManager start before started event
             // this is too stop any race conditions where other scripts add their started event before SOM is setup
-            ObjectManager?.ServerStarted(this);
+            if (ObjectManager != null)
+                ObjectManager.ServerStarted(this);
             _started?.Invoke();
 
             if (LocalClient != null)