Merge branch 'main' of https://github.com/utastudents/cse3310_sp24_gr…

…oup_5

html/index.html

@@ -539,5 +539,6 @@ <h2>Leaderboard</h2>
     socket.send(JSON.stringify(data));
 
 }
+
 </script>
 

src/main/java/uta/cse3310/App.java

@@ -187,13 +187,16 @@ public void insertInnerMap(UserEvent U,HashMap<String, HashMap<String, ArrayList
     @Override
     public void onError(WebSocket conn, Exception ex) {
         ex.printStackTrace();
+
         if (conn != null) {
-            // some errors like port binding failed may not be assignable to a specific
-            // websocket
+            conn.close();
+            Connections.remove(conn);
+        } else {
+            System.out.println("An error occurred: " + ex.getMessage());
         }
-        System.out.println("[ERROR] onError()");
     }
 
+
     @Override
     public void onStart() {
         System.out.println("Server has started!");

src/main/java/uta/cse3310/Game.java

@@ -9,6 +9,7 @@ public class Game // implements Chat, Timer, GridField, LeaderBoard, Wordlist
 {
     private int gameMode;
     private String gameID;
+    private Set<String> usedColors;
     private ArrayList<Player> playersList = new ArrayList<Player>();
     public Player winner = null;
     public boolean gameStatus;
@@ -22,6 +23,7 @@ public Game() {
         this.gameMode = gameMode;
         this.gameID = UUID.randomUUID().toString();
         gameStatus = false;
+        usedColors = new HashSet<>();
     }
 
     public ArrayList<Player> getPlayersList() // I need to add this since Lobby class needs to access the game's player
@@ -182,6 +184,31 @@ public void displayRules() {
 
     }
 
+    public boolean addPlayer(Player newPlayer) {
+        if (isUniquePlayerName(newPlayer.getNick())) {
+            if (isUniquePlayerColor(newPlayer.getColor())) {
+                playersList.add(newPlayer);
+                return true; 
+            } else {
+                System.out.println("Color is already in use.");
+            }
+        } else {
+            System.out.println("Player name is already in use.");
+        }
+        return false; 
+    }
 
+    private boolean isUniquePlayerName(String playerName) {
+        for (Player player : playersList) {
+            if (player.getNick().equals(playerName)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isUniquePlayerColor(String playerColor) {
+        return !usedColors.contains(playerColor);
+    }
 }
 

src/main/java/uta/cse3310/Player.java

@@ -57,10 +57,14 @@ public int getScore()
     }
 
     // Method to increase player score
-    public void increaseScore(int points) 
+    public void increaseScore(int points)
     {
-        this.score += points;
-        this.totalPoints += points; // Assuming totalPoints accumulates all points ever scored
+        if (points >= 0) {
+            this.score += points;
+            this.totalPoints += points;
+        } else {
+            throw new IllegalArgumentException("Points must be non-negative.");
+        }
     }
 
     // Getter for player status
@@ -91,9 +95,8 @@ public void addGameWin()
     @Override
     public String toString() 
     {
-
         return "Player{" +
-               "nick=" + nick  +
+               "nick='" + nick + '\'' +
                ", score=" + score +
                ", status=" + status +
                ", totalPoints=" + totalPoints +