Merge branch 'master' of https://github.com/pacien/upem-java-wallj

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java b/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
index d7b1638..7f0464c 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
@@ -13,19 +13,18 @@ public class GameStateController implements Controller {
 
   @Override
   public List<Event> update(Context context) {
-    boolean isConfirmEvent = context.getEvents().stream().anyMatch(event -> event instanceof ConfirmOrder);
-    boolean isGameOverEvent = context.getEvents().stream().anyMatch(event -> event instanceof GameOverEvent);
+    boolean isConfirmOrder = Event.findFirst(context.getEvents(),ConfirmOrder.class).isPresent();
+    boolean isGameOverEvent = Event.findFirst(context.getEvents(),GameOverEvent.class).isPresent();
     Game currentGame = context.getGame();
     LinkedList<Event> events = new LinkedList<>();
-    //TODO exiting
     if (isGameOverEvent) {
       currentGame.setOver();
     } else {
-      if (isConfirmEvent) {
+      if (isConfirmOrder) {
         if (currentGame.getCurrentStage().isCleared()) {
           if (currentGame.hasNextBoard()) { //continue
             currentGame.nextStage();
-          } else { //no more board so game over
+          } else { //no more board so game over => exiting
             currentGame.setOver();
           }
         } else {//retry