Fix and simplify blasts propagation

2 files changed, 12 insertions, 3 deletions

diff --git a/src/ch/epfl/xblast/server/Block.java b/src/ch/epfl/xblast/server/Block.java
index 6076297..ca04f31 100644
--- a/src/ch/epfl/xblast/server/Block.java
+++ b/src/ch/epfl/xblast/server/Block.java
@@ -87,6 +87,15 @@ public enum Block {
     }
 
     /**
+     * Returns T(this block is destructible).
+     *
+     * @return T(this block is destructible)
+     */
+    public boolean isDestructible() {
+        return this != INDESTRUCTIBLE_WALL;
+    }
+
+    /**
      * Returns T(this block is a bonus).
      *
      * @return T(this block is a bonus)
diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index ab6f2a6..f3547dc 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -113,13 +113,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(b -> !b.tail().isEmpty())
                         .filter(b -> board0.blockAt(b.head()).isFree())
                         .map(Sq::tail),
                 explosions0.stream()
                         .filter(e -> !e.isEmpty())
-                        .map(Sq::head)
-                        .filter(b -> !b.isEmpty()))
+                        .map(Sq::head))
+                .filter(b -> !b.isEmpty())
+                .filter(b -> board0.blockAt(b.head()).isDestructible())
                 .collect(Collectors.toList());
     }