Add checks to allow reconnection to work

project-fika · Jun 2, 2024 · df0fa35 · df0fa35
1 parent ebb7f3c
commit df0fa35
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/Fika.Core/Coop/Utils/NetManagerUtils.cs b/Fika.Core/Coop/Utils/NetManagerUtils.cs
@@ -60,15 +60,25 @@ public static Task InitNetManager(bool isServer)
             {
                 if (isServer)
                 {
-                    return Singleton<FikaServer>.Instance.Init();
+                    FikaServer server = Singleton<FikaServer>.Instance;
+                    if (!server.Started)
+                    {
+                        return server.Init();
+                    }
+                    return Task.CompletedTask;
                 }
                 else
                 {
-                    Singleton<FikaClient>.Instance.Init();
+                    FikaClient client = Singleton<FikaClient>.Instance;
+                    if (!client.Started)
+                    {
+                        client.Init();
+                    }
                     return Task.CompletedTask;
                 }
             }
 
+            logger.LogError("InitNetManager: FikaGameObject was null!");
             return Task.CompletedTask;
         }
 

diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs
@@ -52,6 +52,17 @@ public NetManager NetClient
         public int Port { get; private set; }*/
         public bool SpawnPointsReceived { get; private set; } = false;
         private readonly ManualLogSource clientLogger = BepInEx.Logging.Logger.CreateLogSource("Fika.Client");
+        public bool Started
+        {
+            get
+            {
+                if (_netClient == null)
+                {
+                    return false;
+                }
+                return _netClient.IsRunning;
+            }
+        }
 
         public void Init()
         {
@@ -111,6 +122,7 @@ public void Init()
             };
 
             FikaEventDispatcher.DispatchEvent(new FikaClientCreatedEvent(this));
+            Started = true;
         }
 
         public void SetupGameVariables(CoopPlayer coopPlayer)

diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs
@@ -56,6 +56,17 @@ public NetManager NetServer
         public bool hasHadPeer = false;
         private readonly ManualLogSource serverLogger = BepInEx.Logging.Logger.CreateLogSource("Fika.Server");
         private int _currentNetId;
+        public bool Started
+        {
+            get
+            {
+                if (_netServer == null)
+                {
+                    return false;
+                }
+                return _netServer.IsRunning;
+            }
+        }
 
         public async Task Init()
         {