From 3040595193fd01538d37e7d2a42b76e71d84bcbd Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sun, 8 Dec 2024 20:28:09 +0100 Subject: [PATCH] minor fixes to initialize method in noPiece state of server --- .../automaton/game/turn/choosepiece/NoPieceState.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java index f32446d0..1a15946f 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java @@ -31,10 +31,12 @@ private void initialize(){ if (activePlayer.hasPieceInWaitingArea()){ if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){ this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getWaitingPieceState()); + } else { + this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState()); } + } else { this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState()); } - this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState()); } } else if (activePlayer.hasPieceInWaitingArea()) { if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){ @@ -45,6 +47,8 @@ private void initialize(){ } } else if (canMove(logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].getOccupant())){ this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getStartPieceState()); + } else { + checkSelectPiece(activePlayer); } } else { checkSelectPiece(activePlayer);