fix game end player removal error

kevinchen2002 · Aug 4, 2023 · 78e9af6 · 78e9af6
1 parent d0fbb67
commit 78e9af6
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/main/java/com/wordhunter/server/ServerAcceptClients.java b/src/main/java/com/wordhunter/server/ServerAcceptClients.java
@@ -54,18 +54,24 @@ public void removePlayer(int index) {
  playerColorListLock.acquire();
 
  // remove from server lists
- Player removedPlayer = ServerMain.playerList.remove(index);
- colorIds.add(removedPlayer.getColor());
- // store for allowing reconnect attempt
- disconnectedPlayerList.add(removedPlayer);
+ try {
+ Player removedPlayer = ServerMain.playerList.remove(index);
+ colorIds.add(removedPlayer.getColor());
+ // store for allowing reconnect attempt
+ disconnectedPlayerList.add(removedPlayer);
+
+ // broadcast updated player list and color ids
+ ServerMain.broadcast("playerDisconnect" + ServerMain.messageDelimiter
+ + "playerList" + ServerMain.messageDelimiter
+ + ","
+ + PlayerConversion.fromPlayers(ServerMain.playerList)
+ + ServerMain.messageDelimiter);
+ playerColorListLock.release();
+ }
+ catch (ArrayIndexOutOfBoundsException e){
+ System.out.println("Game has already ended, no players to remove.");
+ }
 
- // broadcast updated player list and color ids
- ServerMain.broadcast("playerDisconnect" + ServerMain.messageDelimiter
- + "playerList" + ServerMain.messageDelimiter
- + ","
- + PlayerConversion.fromPlayers(ServerMain.playerList)
- + ServerMain.messageDelimiter);
- playerColorListLock.release();
  } catch (InterruptedException ignored) {
  }
  }