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 02384ab3..36f1f7f7 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 @@ -55,9 +55,14 @@ else if (40 > targetIdx && (!piece.getState().equals(PieceState.HOME) || !piece. //checks if the target-node is not occupied by an own color if (!tartgetNode.isOccupied(activeColor)) { //checks if the targetNode is not occupied or the occupant ha no shield - if (!tartgetNode.isOccupied() || tartgetNode.getOccupant().getShield() != ShieldState.ACTIVE) { - return true; + if(tartgetNode.isOccupied()) { + return false; } + if(tartgetNode.getOccupant().getShield().equals(ShieldState.ACTIVE)) { + System.out.println("Server: targetNode.getOccupant().getShield().equals(ShieldState.ACTIVE"+tartgetNode.getOccupant().getShield().equals(ShieldState.ACTIVE)); + return false; + } + return true; } } //returns false it the piece can't move