Make nextBlasts great again

2 files changed, 5 insertions, 4 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 288aeb8..e75da1d 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -103,11 +103,13 @@ public final class GameState {
     private static List<Sq<Cell>> nextBlasts(List<Sq<Cell>> blasts0, Board board0, List<Sq<Sq<Cell>>> explosions0) {
         return Stream.concat(
                 blasts0.stream()
-                        .filter(blastSeq -> !blastSeq.tail().isEmpty())
-                        .filter(blastSeq -> board0.blockAt(blastSeq.head()).isFree())
+                        .filter(b -> !b.tail().isEmpty())
+                        .filter(b -> board0.blockAt(b.head()).isFree())
                         .map(Sq::tail),
                 explosions0.stream()
-                        .map(Sq::head))
+                        .filter(e -> !e.isEmpty())
+                        .map(Sq::head)
+                        .filter(b -> !b.isEmpty()))
                 .collect(Collectors.toList());
     }
 
diff --git a/src/ch/epfl/xblast/server/Ticks.java b/src/ch/epfl/xblast/server/Ticks.java
index b880dd7..a4c3e74 100644
--- a/src/ch/epfl/xblast/server/Ticks.java
+++ b/src/ch/epfl/xblast/server/Ticks.java
@@ -34,7 +34,6 @@ public interface Ticks {
      * Duration of crumbling of a wall (in ticks).
      */
     int WALL_CRUMBLING_TICKS = EXPLOSION_TICKS;
-
     /**
      * Duration of the presence of a bonus (in ticks).
      */