From f69a2a9fda407a5669c52904e049add2e43bfbb3 Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sun, 17 Nov 2024 21:04:13 +0100 Subject: [PATCH 1/2] added a method to check if a player has pieces in his waiting area --- .../src/main/java/pp.mdga/game/PlayerData.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java b/Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java index b82893aa..7f2d48d2 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java @@ -136,4 +136,18 @@ public int getIndexInHome(Piece piece) { } return -1; } + + /** + * This method returns the homeNodes + * + * @return the homeNodes + */ + public boolean hasPieceInWaitingArea() { + for (Piece piece : waitingArea) { + if (piece != null) { + return true; + } + } + return false; + } } From 9cd9cc871ce805ff88aa37c824b31f28585d6b15 Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sun, 17 Nov 2024 21:18:19 +0100 Subject: [PATCH 2/2] fixed a bug with use of addLast method for ArrayList which doesnot exist in Java 20 --- .../client/src/main/java/pp/mdga/client/board/BoardView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardView.java index 01c9e36d..ee2a6c02 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardView.java @@ -60,7 +60,7 @@ private void initMap() { case cir -> addFigureToPlayerMap(assetToColor(BoardAsset.cir), assetOnMap); case marine -> addFigureToPlayerMap(assetToColor(BoardAsset.marine), assetOnMap); case node_normal, node_bonus, node_start -> - infield.addLast(displayAndControl(assetOnMap, new NodeControl())); + infield.add(displayAndControl(assetOnMap, new NodeControl())); default -> displayAsset(assetOnMap); } }