diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java index c9b55972..2b846621 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java @@ -56,7 +56,7 @@ public void setState(GameStates newState){ if(this.state != null){ this.state.exit(); } - System.out.println("CLIENT STATE old:" + this.state + " new:" + newState); + System.out.println("CLIENT STATE old: " + this.state + " new: " + newState); newState.enter(); state = newState; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java index 0fd02776..3335f81a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java @@ -160,7 +160,6 @@ public boolean equals(Object obj) { if (obj instanceof Piece) { Piece piece = (Piece) obj; - System.out.println("own UUID: " + this.uuid + ". Other UUID: " + piece.uuid); return uuid.toString().equals(piece.uuid.toString()); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java index 3c923f25..be16512e 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java @@ -207,7 +207,7 @@ public CeremonyState getCeremonyState() { * @param state as the new currentState attribute as a ServerState object. */ public void setCurrentState(ServerState state) { - System.out.println("SERVER STATE old:" + this.currentState + " new:" + state); + System.out.println("SERVER STATE old: " + this.currentState + " new: " + state); if (this.currentState != null) { this.currentState.exit(); diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java index b75ad260..fc4e50e0 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java @@ -93,7 +93,7 @@ private boolean canHomeMove(Piece piece, int moveIndex){ protected int calculateTargetIndex(Piece piece){ int steps = logic.getGame().getDiceModifier() * logic.getGame().getDiceEyes(); - LOGGER.log(System.Logger.Level.INFO, "Calculating target index for piece: " + piece.getUuid() + " with steps: " + steps + "start index: " + logic.getGame().getBoard().getInfieldIndexOfPiece(piece)); + return (logic.getGame().getBoard().getInfieldIndexOfPiece(piece) + steps) % logic.getGame().getBoard().getInfield().length; } }