From d1b4aa9ddaeb502256c339e0bf87d9def1de1a6d Mon Sep 17 00:00:00 2001 From: Felix Koppe Date: Sun, 8 Dec 2024 15:24:59 +0100 Subject: [PATCH] Fix error --- .../src/main/java/pp/mdga/client/gamestate/WaitingState.java | 4 +++- .../gamestate/turnstate/choosepiecestate/NoPieceState.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java index a08c3d4f..6c0ab752 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java @@ -62,7 +62,9 @@ public void received(PlayCardMessage msg) { public void received(ActivePlayerMessage msg) { logic.addNotification(new ActivePlayerNotification(msg.getColor())); logic.getGame().setActiveColor(msg.getColor()); - parent.setState(parent.getTurn()); + if(msg.getColor() == logic.getGame().getPlayers().get(logic.getOwnPlayerId()).getColor()) { + parent.setState(parent.getTurn()); + } } @Override 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 55e4d4a2..6946de2f 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 @@ -37,7 +37,7 @@ public void exit() { @Override public void received(SelectPieceMessage msg) { - LOGGER.log(System.Logger.Level.INFO, "fuck this"); + //TODO ArrayList pieces = msg.getPieces().stream().map(piece -> logic.getGame().getPieceThroughUUID(piece.getUuid())).collect(Collectors.toCollection(ArrayList::new)); parent.getSelectPiece().setPossiblePieces(pieces); LOGGER.log(System.Logger.Level.INFO, "Received " + msg.getPieces().size() + " pieces");