Fix new players joining while game is running

devedse · Oct 1, 2023 · 47a55a3 · 47a55a3
1 parent 65ea092
commit 47a55a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/UnityGame/Assets/Scripts/MinigameManager.cs b/UnityGame/Assets/Scripts/MinigameManager.cs
@@ -134,6 +134,8 @@ public void Start()
 
     public void InitializeNewGame()
     {
+        SignalR.LobbyHasStartedSoBlockNewPlayerJoins = true;
+
         ScoreCanvas.SetActive(true);
         DontDestroyOnLoad(ScoreCanvas);
         foreach (var scscr in ScoreCanvas.GetComponentsInChildren<IngameScoreScreen>())

diff --git a/UnityGame/Assets/Scripts/SignalRTest.cs b/UnityGame/Assets/Scripts/SignalRTest.cs
@@ -17,6 +17,8 @@ public class SignalRTest : MonoBehaviour
 
     private string DeveURL = "https://LD54_Server.Devedse.DuckDNS.org/UltraHub";
 
+    public bool LobbyHasStartedSoBlockNewPlayerJoins { get; set; } = false;
+
     public PC GetPlayerByNumber(int playerNumber)
     {
         return Players.Values.FirstOrDefault(t => t.PlayerIndex == playerNumber);
@@ -139,7 +141,7 @@ public PC AddOrConnectClient(string name)
             existingPc.IsConnected = true;
             return existingPc;
         }
-        else
+        else if (!LobbyHasStartedSoBlockNewPlayerJoins)
         {
             var player = Instantiate(PlayerPrefab, transform);
             var pc = player.GetComponent<PC>();
@@ -152,6 +154,10 @@ public PC AddOrConnectClient(string name)
 
             return pc;
         }
+        else
+        {
+            return null;
+        }
     }
 
     public void HandleLeaveEvents()