diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index 17ddf46..7a56903 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -814,10 +814,7 @@ public class Game implements Serializable { */ private void EventResolution() { - if(currentState.getGameStage()!= GameStages.RES_EVENT) - { - return; - } + currentState.GameStageUpdate(GameStages.RES_EVENT); Queue events; events=board.getPendingEvents(); ArrayListsustenance=events.stream().filter(x->x.getType().equals(EventType.SUSTENANCE)).collect(Collectors.toCollection(ArrayList::new));