From c25e17fd90675eb9e927a3f4d0ce538f835e03db Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sun, 8 Dec 2024 19:14:48 +0100 Subject: [PATCH] fixed waitingpiece move --- .../gamestate/turnstate/choosepiecestate/NoPieceState.java | 3 ++- .../turnstate/choosepiecestate/SelectPieceState.java | 3 ++- .../turnstate/choosepiecestate/WaitingPieceState.java | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java index e9f6aee9..c011f949 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java @@ -49,7 +49,8 @@ public void received(SelectPieceMessage msg) { @Override public void received(WaitPieceMessage msg){ LOGGER.log(System.Logger.Level.INFO, "Received WaitPieceMessage"); - logic.addNotification(new MovePieceNotification(msg.getPieceID(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true)); + Piece piece = logic.getGame().getPieceThroughUUID(msg.getPieceID()); + logic.addNotification(new SelectableMoveNotification(new ArrayList<>(List.of(msg.getPieceID())), new ArrayList<>(List.of(logic.getGame().getPlayerByColor(piece.getColor()).getStartNodeIndex())), new ArrayList<>(List.of(false)))); parent.setState(parent.getWaitingPiece()); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java index f97f7090..1ff2824b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java @@ -26,6 +26,7 @@ public SelectPieceState(ClientState parent, ClientGameLogic logic) { @Override public void enter() { + } @Override @@ -39,7 +40,7 @@ public void setPossiblePieces(ArrayList possiblePieces) { @Override public void selectPiece(Piece piece) { - if(possiblePieces.contains(piece)){ + if (possiblePieces.contains(piece)) { logic.send(new RequestMoveMessage(piece)); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java index 0d8b7f8f..6f88dfd5 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java @@ -36,9 +36,7 @@ public void exit() { @Override public void selectPiece(Piece piece){ - if(moveablePiece.equals(piece)){ - logic.send(new RequestMoveMessage(piece)); - } + logic.send(new RequestMoveMessage(piece)); } @Override