peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2

Browse Source
This commit is contained in:
Benjamin Feyer
2024-12-10 12:47:22 +01:00
parent ea1978d5a8 1ead0e2e9e
commit 30997eb571
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java
View File

@@ -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;
}

2
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/ShieldCardState.java
View File

@@ -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);
}
}