Merge remote-tracking branch 'refs/remotes/origin/main'

davi-bart · Feb 15, 2024 · b81c39e · b81c39e
2 parents d838377 + aab1596
commit b81c39e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/main/java/it/unibo/controller/impl/MainControllerImpl.java b/src/main/java/it/unibo/controller/impl/MainControllerImpl.java
@@ -149,12 +149,7 @@ public boolean hasResources(final String playerName, final Map<ResourceType, Int
 
     @Override
     public boolean canEndTurn() {
-        final int cycle = turnController.getCycle();
-        if (cycle <= 2) {
-            return this.boardController.getPlayerPropertyPositions(getCurrentPlayer()).size() == cycle
-                    && this.boardController.getPlayerRoadPositions(getCurrentPlayer()).size() == cycle;
-        }
-        return !mustPlaceRobber() && turnController.hasRolled();
+        return !mustPlaceRobber() && gameManager.canEndTurn();
     }
 
     @Override
@@ -216,9 +211,9 @@ public boolean mustPlaceRobber() {
 
     @Override
     public Pair<Integer, Integer> rollDie() {
-        final Pair<Integer, Integer> rolledValue = turnController.rollDie();
-        produceResources(rolledValue.getLeft() + rolledValue.getRight());
-        mustPlaceRobber = rolledValue.getLeft() + rolledValue.getRight() == 7;
-        return rolledValue;
+        final Pair<Integer, Integer> rolledDies = turnController.rollDie();
+        produceResources(rolledDies.getLeft() + rolledDies.getRight());
+        mustPlaceRobber = (rolledDies.getLeft() + rolledDies.getRight()) == 7;
+        return rolledDies;
     }
 }
diff --git a/src/main/java/it/unibo/model/api/GameManager.java b/src/main/java/it/unibo/model/api/GameManager.java
@@ -77,6 +77,11 @@ public interface GameManager {
      */
     boolean canBuyCard(Player player);
 
+    /**
+     * @return whether the current player can end the turn
+     */
+    boolean canEndTurn();
+
     /**
      * Make each tile with number {@code number} produce its resource.
      * It automatically updates the resources of each player.

diff --git a/src/main/java/it/unibo/model/impl/GameManagerImpl.java b/src/main/java/it/unibo/model/impl/GameManagerImpl.java
@@ -293,4 +293,14 @@ private boolean isRoadNearToAnyPlayerProperty(final RoadPosition roadPosition, f
                 });
     }
 
+    @Override
+    public boolean canEndTurn() {
+        final int cycle = turnManager.getCycle();
+        if (cycle < 2) {
+            return this.propertyManager.getPlayerProperties(turnManager.getCurrentPlayerTurn()).size() == cycle
+                    && this.roadManager.getPlayerRoads(turnManager.getCurrentPlayerTurn()).size() == cycle;
+        }
+        return turnManager.hasRolled();
+    }
+
 }