diff --git a/src/main/java/org/toop/frontend/UI/UIGameBoard.java b/src/main/java/org/toop/frontend/UI/UIGameBoard.java index 0162f25..9e1fd9c 100644 --- a/src/main/java/org/toop/frontend/UI/UIGameBoard.java +++ b/src/main/java/org/toop/frontend/UI/UIGameBoard.java @@ -51,9 +51,10 @@ public class UIGameBoard { final int index = i; cells[i].addActionListener((ActionEvent e) -> { + int cp = this.localTicTacToe.getCurrentPlayersTurn(); + if (cp == 1) { this.currentPlayer = "X"; } + else if (cp == 2) { this.currentPlayer = "O"; } cells[index].setText(currentPlayer); - if (Objects.equals(currentPlayer, "X")) { currentPlayer = "O"; } - else { currentPlayer = "X"; } this.localTicTacToe.move(index); System.out.println("Cell clicked: " + index); }); diff --git a/src/main/java/org/toop/frontend/games/LocalTicTacToe.java b/src/main/java/org/toop/frontend/games/LocalTicTacToe.java index 0b31739..36e90c0 100644 --- a/src/main/java/org/toop/frontend/games/LocalTicTacToe.java +++ b/src/main/java/org/toop/frontend/games/LocalTicTacToe.java @@ -23,6 +23,8 @@ public class LocalTicTacToe { // TODO: Implement runnable * Is either 1 or 2. */ private int playersTurn = 1; + public int getCurrentPlayersTurn() { return this.playersTurn; } + // LocalTicTacToe(String gameId, String connectionId, String serverId) { // this.gameId = gameId;