From f4a224621ec1d8c342556e583714ac98ce2bea44 Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Sun, 8 Dec 2024 20:05:37 +0100 Subject: [PATCH] deleted unwanted code (next Color) --- Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java | 2 +- .../mdga/server/automaton/game/turn/MovePieceState.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java index 93fb9193..eaa43c13 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java @@ -85,7 +85,7 @@ public Game() { gameStatistics = new Statistic(); initializeDrawPile(); board = new Board(); - die = new Die(); + die = new Die(2,1,6,2,1,3); } /** diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java index dcc1166a..549fdd96 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java @@ -36,12 +36,9 @@ public void enter() { } private void setActivePlayer(Color activePlayer) { - if (!logic.getGame().getPlayerByColor(activePlayer.next(logic.getGame())).isFinished()) { - logic.getGame().setActiveColor(logic.getGame().getActiveColor().next(logic.getGame())); - logic.getServerSender().broadcast(new ActivePlayerMessage(activePlayer.next(logic.getGame()))); - } else { - throw new RuntimeException("handle player finished is not yet implemented"); //TODO - } + Color newColor = activePlayer.next(logic.getGame()); + logic.getGame().setActiveColor(newColor); + logic.getServerSender().broadcast(new ActivePlayerMessage(newColor)); } @Override