Fix not being able to ignore shaman

Mw3y · May 7, 2024 · 064050b · 064050b
1 parent 42f358c
commit 064050b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ch/epfl/chacun/gui/Main.java b/src/ch/epfl/chacun/gui/Main.java
@@ -108,7 +108,7 @@ public void start(Stage primaryStage) throws Exception {
         };
 
         Consumer<Occupant> selectOccupant = occupant -> {
-            if (!gameStateO.get().board().occupants().contains(occupant)) {
+            if (gameStateO.get().nextAction() == GameState.Action.OCCUPY_TILE && !gameStateO.get().board().occupants().contains(occupant)) {
                 ActionEncoder.StateAction stateAction = ActionEncoder.withNewOccupant(gameStateO.get(), occupant);
                 // Add action
                 List<String> actions = new ArrayList<>(actionsP.get());
@@ -120,7 +120,7 @@ public void start(Stage primaryStage) throws Exception {
                 visibleOccupantsP.set(gameStateO.get().board().occupants());
                 textToDisplayP.set("");
             }
-            else if(gameStateO.get().nextAction() == GameState.Action.RETAKE_PAWN) {
+            else if (gameStateO.get().nextAction() == GameState.Action.RETAKE_PAWN) {
                 ActionEncoder.StateAction stateAction = ActionEncoder.withOccupantRemoved(gameStateO.get(), occupant);
                 // Add action
                 List<String> actions = new ArrayList<>(actionsP.get());