2 files changed, 53 insertions, 4 deletions

diff --git a/src/ch/epfl/xblast/server/Board.java b/src/ch/epfl/xblast/server/Board.java
index 18ee532..f2a3c89 100644
--- a/src/ch/epfl/xblast/server/Board.java
+++ b/src/ch/epfl/xblast/server/Board.java
@@ -142,4 +142,12 @@ public final class Board {
         return this.blocksAt(c).head();
     }
 
+    /**
+     * Return the blocks of the Board.
+     *
+     * @return a list of the Sequences of blocks of the board.
+     */
+    public List<Sq<Block>> getBlocks() {
+        return blocks;
+    }
 }
diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 522a367..d34c2a4 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -119,7 +119,29 @@ public final class GameState {
      * @return the next board
      */
     private static Board nextBoard(Board board0, Set<Cell> consumedBonuses, Set<Cell> blastedCells1) {
-        return null; // TODO
+        List<Sq<Block>> blocks0 = board0.getBlocks();
+        List<Sq<Block>> blocks1 = new ArrayList<>();
+
+        int i = 0;
+        for (Sq<Block> blockSq : blocks0) {
+            int cellId = blocks0.get(i).hashCode();
+            Block block = blockSq.head();
+            if (((HashSet) consumedBonuses).contains(cellId) && block.isBonus()) {
+                blocks1.add(Sq.constant(Block.FREE));
+            } else if (((HashSet) blastedCells1).contains(cellId) && (block == Block.DESTRUCTIBLE_WALL || block.isBonus())) {
+                if (block == Block.DESTRUCTIBLE_WALL) {
+                    Block bonus = randomBonus();
+                    blocks1.add(Sq.repeat(Ticks.WALL_CRUMBLING_TICKS, Block.CRUMBLING_WALL).concat(Sq.constant(bonus)));
+                } else {
+                    blocks1.add(Sq.repeat(Ticks.BONUS_DISAPPEARING_TICKS, block).concat(Sq.constant(Block.FREE)));
+                }
+            } else {
+                blocks1.add(blockSq.tail());
+            }
+            i++;
+        }
+
+        return new Board(blocks1);
     }
 
     /**
@@ -140,7 +162,8 @@ public final class GameState {
             Board board1,
             Set<Cell> blastedCells1,
             Map<PlayerID, Optional<Direction>> speedChangeEvents) {
-        return null; // TODO
+        //ToDo
+        return players0;
     }
 
     /**
@@ -150,7 +173,11 @@ public final class GameState {
      * @return the next explosion state
      */
     private static List<Sq<Sq<Cell>>> nextExplosions(List<Sq<Sq<Cell>>> explosions0) {
-        return null; // TODO
+        List<Sq<Sq<Cell>>> explosions1 = new ArrayList<>();
+        for (Sq<Sq<Cell>>  explosion : explosions0) {
+            explosions1.add(explosion.tail());
+        }
+        return explosions1;
     }
 
     /**
@@ -165,7 +192,21 @@ public final class GameState {
             List<Player> players0,
             Set<PlayerID> bombDropEvents,
             List<Bomb> bombs0) {
-        return null; // TODO
+        List<Bomb> bombs1 = new ArrayList<>();
+        Set<Cell> containingBombCells = new HashSet<>();
+
+        for (Bomb bomb : bombs0) {
+            containingBombCells.add(bomb.position());
+        }
+
+        for (Player player : players0) {
+            if (bombDropEvents.contains(player.id()) && player.isAlive() && !containingBombCells.contains(player.position().containingCell())) {
+                    Bomb newBomb = new Bomb(player.id(), player.position().containingCell(), Ticks.BOMB_FUSE_TICKS, player.bombRange());
+                    containingBombCells.add(newBomb.position());
+                    bombs1.add(newBomb);
+            }
+        }
+        return bombs1;
     }
 
     private final int ticks;