Attempt to fix multiple lobbies running

utastudents · Aug 7, 2024 · 2c4a50b · 2c4a50b
1 parent bfaddf3
commit 2c4a50b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/html/index.js b/html/index.js
@@ -48,16 +48,24 @@ connection.onmessage = function (evt) {
 
     // When server is online, lobby ID should be displayed in the header of the html file under the title of the game
     if('players' in obj) {
+        lobbyId = obj.lobbyId;
+        id = obj.playerID;
+        conn = obj.conn;
+        lobbyPlayerCount = obj.playerCount;
         var t = obj.lobbyId;
         if(t) {
             console.log("Lobby ID retrieved successfully");
-            document.getElementById("topMessage").innerHTML = "Lobby: " + t;
+            if(lobbyId == obj.lobbyId && id == obj.playerID) {
+                document.getElementById("topMessage").innerHTML = "Lobby: " + t;
+            }
+        } 
+        t = obj.playerID;
+        if(t) {
+            console.log("Player ID retrieved successfully");
+            document.getElementById("topMessage2").innerHTML = "Player: " + t;
         }
-
-        lobbyId = obj.lobbyId;
-        lobbyPlayerCount = obj.playerCount;
     }
-    else if('playerID' in obj) {
+    /*else if('playerID' in obj) {
         var t = obj.playerID;
         if(t) {
             console.log("Player ID retrieved successfully");
@@ -66,7 +74,7 @@ connection.onmessage = function (evt) {
 
         id = obj.playerID;
         conn = obj.conn;
-    }
+    }*/
     else if('roundNumber' in obj) {
         var lobbyScreen = document.getElementById("lobbyScreen");
         var gameScreen = document.getElementById("gameScreen");

diff --git a/src/main/java/uta/cse3310/App.java b/src/main/java/uta/cse3310/App.java
@@ -100,7 +100,7 @@ public void onOpen(WebSocket conn, ClientHandshake handshake) {
     // search for a lobby needing a player
     Lobby L = null;
     for (Lobby i : ActiveLobbies) {
-      if (i.getPlayerCount() >= 1 && i.getPlayerCount() < 4) {
+      if ((i.getPlayerCount() >= 1 && i.getPlayerCount() < 4) && i.gameStatus == false) {
         L = i;
         System.out.println("FOUND AN ONGOING LOBBY");
       }
@@ -121,12 +121,12 @@ public void onOpen(WebSocket conn, ClientHandshake handshake) {
     } 
     else if(L.getGameStatus() == false) {
       // join an existing Lobby
-      System.out.println("NOT A NEW LOBBY");
       Player newPlayer = new Player("", connectionId, conn.toString());
       String jsonString = gson.toJson(newPlayer);
       conn.send(jsonString);
       L.players.add(newPlayer);
       L.setPlayerCount();
+      System.out.println("NOT A NEW LOBBY");
     }
     /*else {
       L = new Lobby(lobbyId);