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

adjusted all useages of the SelectedPieces consturctor to transfer the right parameters

Browse Source
This commit is contained in:
Hanno Fleischer
2024-12-06 02:12:59 +01:00
parent 0a1bd1f503
commit 55d398b428
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
View File

@@ -37,8 +37,10 @@ public void setPossiblePieces(ArrayList<Piece> possiblePieces) {
@Override @Override
public void selectPiece(Piece piece) { public void selectPiece(Piece piece) {
ArrayList<Piece> pieces = new ArrayList<>();
if(possiblePieces.contains(piece)){ if(possiblePieces.contains(piece)){
logic.send(new SelectedPiecesMessage(piece.getUuid())); pieces.add(piece);
logic.send(new SelectedPiecesMessage(pieces));
} }
} }

6
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
View File

@@ -7,6 +7,8 @@
import pp.mdga.message.client.SelectedPiecesMessage; import pp.mdga.message.client.SelectedPiecesMessage;
import pp.mdga.message.server.MoveMessage; import pp.mdga.message.server.MoveMessage;
import java.util.ArrayList;
public class StartPieceState extends ChoosePieceStates { public class StartPieceState extends ChoosePieceStates {
private final ChoosePieceState parent; private final ChoosePieceState parent;
@@ -30,8 +32,10 @@ public void exit() {
@Override @Override
public void selectPiece(Piece piece){ public void selectPiece(Piece piece){
ArrayList<Piece> pieces = new ArrayList<>();
if(moveablePiece.equals(piece)){ if(moveablePiece.equals(piece)){
logic.send(new SelectedPiecesMessage(piece.getUuid())); pieces.add(piece);
logic.send(new SelectedPiecesMessage(pieces));
} }
} }

7
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
View File

@@ -8,6 +8,9 @@
import pp.mdga.message.client.SelectedPiecesMessage; import pp.mdga.message.client.SelectedPiecesMessage;
import pp.mdga.message.server.MoveMessage; import pp.mdga.message.server.MoveMessage;
import java.util.ArrayList;
import java.util.List;
public class WaitingPieceState extends ChoosePieceStates { public class WaitingPieceState extends ChoosePieceStates {
private final ChoosePieceState parent; private final ChoosePieceState parent;
@@ -29,8 +32,10 @@ public void exit() {
@Override @Override
public void selectPiece(Piece piece){ public void selectPiece(Piece piece){
ArrayList<Piece> pieces = new ArrayList<>();
if(moveablePiece.equals(piece)){ if(moveablePiece.equals(piece)){
logic.send(new SelectedPiecesMessage(piece.getUuid())); pieces.add(piece);
logic.send(new SelectedPiecesMessage(pieces));
} }
} }