refactor: renaming Start to Setup for public methods to start ServerO…

…bjectManager late BREAKING CHANGE: ServerObjectManager.Start renamed to Setup
MirageNet · Apr 10, 2023 · d5f0647 · d5f0647
1 parent e47d4a3
commit d5f0647
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/Assets/Mirage/Runtime/ServerObjectManager.cs b/Assets/Mirage/Runtime/ServerObjectManager.cs
@@ -53,6 +53,8 @@ public class ServerObjectManager : MonoBehaviour
         [FormerlySerializedAs("networkSceneManager")]
         public NetworkSceneManager NetworkSceneManager;
 
+        private bool _hasSetup;
+
         [Header("Authentication")]
         [Tooltip("Will only send spawn message to Players who are Authenticated. Checks the Player.IsAuthenticated property")]
         public bool OnlySpawnOnAuthenticated;
@@ -64,22 +66,33 @@ public class ServerObjectManager : MonoBehaviour
 
         public INetworkVisibility DefaultVisibility { get; private set; }
 
-        public void Start()
+        public void Setup()
         {
-            if (Server != null)
-            {
-                Server.Started.AddListener(OnServerStarted);
-                Server.OnStartHost.AddListener(StartedHost);
-                Server.Stopped.AddListener(OnServerStopped);
+            if (_hasSetup)
+                return;
 
-                if (NetworkSceneManager != null)
-                {
-                    NetworkSceneManager.OnServerFinishedSceneChange.AddListener(OnFinishedSceneChange);
-                    NetworkSceneManager.OnPlayerSceneReady.AddListener(SpawnVisibleObjects);
-                }
+            if (Server == null)
+                throw new InvalidOperationException("Server reference is null");
+
+            _hasSetup = true;
+
+            Server.Started.AddListener(OnServerStarted);
+            Server.OnStartHost.AddListener(StartedHost);
+            Server.Stopped.AddListener(OnServerStopped);
+
+            if (NetworkSceneManager != null)
+            {
+                NetworkSceneManager.OnServerFinishedSceneChange.AddListener(OnFinishedSceneChange);
+                NetworkSceneManager.OnPlayerSceneReady.AddListener(SpawnVisibleObjects);
             }
         }
 
+        private void Start()
+        {
+            if (Server != null)
+                Setup();
+        }
+
         internal void RegisterMessageHandlers()
         {
             Server.MessageHandler.RegisterHandler<ServerRpcMessage>(OnServerRpcMessage);