From 84c5553154644b04e46787a1804a94d84e141fa3 Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sun, 8 Dec 2024 21:47:28 +0100 Subject: [PATCH] fixed former bug --- .../src/main/java/pp/mdga/client/gamestate/WaitingState.java | 3 +-- 1 file changed, 1 insertion(+), 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 1f84ced6..002ce1cd 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 @@ -76,7 +76,6 @@ public void received(MoveMessage msg) { logic.getGame().getPlayerByColor(piece.getColor()).setPieceInHome(msg.getTargetIndex(), piece); } else { int oldIndex = logic.getGame().getBoard().getInfieldIndexOfPiece(piece); - Piece occ = logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].getOccupant(); if (occ != null) { //TODO: MoveThrowNotification @@ -84,7 +83,7 @@ public void received(MoveMessage msg) { //set occ to waiting logic.getGame().getPlayerByColor(occ.getColor()).addWaitingPiece(occ); } - if(msg.getPiece().getState().equals(PieceState.WAITING)){ + if(oldIndex == -1){ logic.addNotification(new MovePieceNotification(piece.getUuid(), msg.getTargetIndex(), true)); logic.getGame().getPlayerByColor(piece.getColor()).removeWaitingPiece(piece); piece.setState(PieceState.ACTIVE);