Version 1.0 #40

Merged
j23f0779 merged 947 commits from development2 into main 2024-12-13 10:26:49 +01:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit e6dbedab0f - Show all commits

View File

@@ -36,11 +36,11 @@ public void enter() {
} }
private void setActivePlayer(Color activePlayer) { private void setActivePlayer(Color activePlayer) {
if (!logic.getGame().getPlayerByColor(activePlayer.next(logic.getGame())).isFinished()) { if (logic.getGame().getPlayerByColor(activePlayer.next(logic.getGame())).isFinished()) {
logic.getGame().setActiveColor(logic.getGame().getActiveColor().next(logic.getGame())); logic.getGame().setActiveColor(logic.getGame().getActiveColor().next(logic.getGame()));
logic.getServerSender().broadcast(new ActivePlayerMessage(activePlayer.next(logic.getGame()))); logic.getServerSender().broadcast(new ActivePlayerMessage(activePlayer.next(logic.getGame())));
} else { } else {
setActivePlayer(activePlayer.next(logic.getGame())); setActivePlayer(logic.getGame().getActiveColor());
} }
} }