From 1ead0e2e9e794d7b8459ef7fc01a9fdfc5a3203d Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Tue, 10 Dec 2024 12:46:04 +0100 Subject: [PATCH] fixed uuid reference bug --- .../game/turn/choosepiece/ChoosePieceAutomatonState.java | 9 ++++----- .../automaton/game/turn/powercard/ShieldCardState.java | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) 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 36f1f7f7..bb72325c 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 @@ -56,11 +56,10 @@ else if (40 > targetIdx && (!piece.getState().equals(PieceState.HOME) || !piece. if (!tartgetNode.isOccupied(activeColor)) { //checks if the targetNode is not occupied or the occupant ha no shield 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; + 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; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/ShieldCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/ShieldCardState.java index c7024e6c..df983a52 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/ShieldCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/ShieldCardState.java @@ -52,7 +52,7 @@ public void received(SelectedPiecesMessage msg, int from) { if (msg.getPieces().size() == 1 && this.powerCardAutomaton.getVisitor().getShieldPieces().contains(msg.getPieces().get(0))) { this.powerCardAutomaton.addSelectedPiece(msg.getPieces().get(0)); for (Piece piece : this.logic.getGame().getPlayerByColor(this.logic.getGame().getActiveColor()).getPieces()) { - if (piece == msg.getPieces().get(0)) { + if (piece.getUuid().equals(msg.getPieces().get(0).getUuid())) { piece.setShield(ShieldState.ACTIVE); } }