peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

minor fixes to initialize method in noPiece state of server

Browse Source
This commit is contained in:
Fleischer Hanno
2024-12-08 20:28:09 +01:00
parent 5d45cf2934
commit 3040595193
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java
View File

@@ -31,11 +31,13 @@ private void initialize(){
if (activePlayer.hasPieceInWaitingArea()){ if (activePlayer.hasPieceInWaitingArea()){
if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){ if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getWaitingPieceState()); this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getWaitingPieceState());
} } else {
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState()); this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState());
} }
} else {
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState()); this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState());
} }
}
} else if (activePlayer.hasPieceInWaitingArea()) { } else if (activePlayer.hasPieceInWaitingArea()) {
if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){ if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){
if (logic.getGame().getDiceEyes() == 6) { if (logic.getGame().getDiceEyes() == 6) {
@@ -45,6 +47,8 @@ private void initialize(){
} }
} else if (canMove(logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].getOccupant())){ } else if (canMove(logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].getOccupant())){
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getStartPieceState()); this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getStartPieceState());
} else {
checkSelectPiece(activePlayer);
} }
} else { } else {
checkSelectPiece(activePlayer); checkSelectPiece(activePlayer);