1 files changed, 33 insertions, 19 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index c9a23ac..31bb902 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -245,6 +245,33 @@ public final class GameState {
     }
 
     /**
+     * Returns a list of exploding bombs (reached by a blast or consumed fuse).
+     *
+     * @param bombs        the list of bombs
+     * @param blastedCells the set of blasted cells
+     * @return the list of exploding bombs
+     */
+    private static List<Bomb> explodingBombs(List<Bomb> bombs, Set<Cell> blastedCells) {
+        return bombs.stream()
+                .filter(b -> blastedCells.contains(b.position()) || b.fuseLength() == 0)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Computes the consumption of the bombs.
+     *
+     * @param bombs0         the list of bombs
+     * @param explodingBombs the list of exploding bombs
+     * @return the new bombs states
+     */
+    private static List<Bomb> nextBombs(List<Bomb> bombs0, List<Bomb> explodingBombs) {
+        return bombs0.stream()
+                .filter(b -> !explodingBombs.contains(b))
+                .map(b -> new Bomb(b.ownerId(), b.position(), b.fuseLengths().tail(), b.range()))
+                .collect(Collectors.toList());
+    }
+
+    /**
      * Computes and returns the list of newly dropped bombs by players according to the given player states and events.
      * Given bomb drop events must be conflict-free.
      *
@@ -255,7 +282,7 @@ public final class GameState {
      */
     private static List<Bomb> newlyDroppedBombs(List<Player> players0, Set<PlayerID> bombDropEvents, List<Bomb> bombs0) {
         HashSet<Cell> bombedCells = new HashSet<>(GameState.bombedCells(bombs0).keySet());
-        List<Bomb> bombs1 = new ArrayList<>();
+        List<Bomb> bombs1 = new ArrayList<>(bombs0);
 
         for (Player p : GameState.alivePlayers(players0)) {
             if (!bombDropEvents.contains(p.id())) continue;
@@ -409,23 +436,23 @@ public final class GameState {
 
         // 4.1. existing bombs evolution
         Set<Cell> blastedCells0 = this.blastedCells();
-        List<Bomb> explodingBombs = this.filterExplodingBombs(this.bombs, blastedCells0);
-        List<Bomb> bombs = this.bombs.stream().filter(b -> !explodingBombs.contains(b)).collect(Collectors.toList());
+        List<Bomb> explodingBombs = GameState.explodingBombs(this.bombs, blastedCells0);
+        List<Bomb> existingBombs = GameState.nextBombs(this.bombs, explodingBombs);
 
         // 4.2. subsequent explosions addition
         explodingBombs.forEach(b -> explosions1.addAll(b.explosion()));
 
         // 4.3. newly dropped bombs addition
         Set<PlayerID> topPriorityBombDropEvents = discardConflictingBombDropEvents(bombDropEvents);
-        bombs.addAll(GameState.newlyDroppedBombs(this.players, topPriorityBombDropEvents, this.bombs));
+        List<Bomb> bombs1 = GameState.newlyDroppedBombs(this.players, topPriorityBombDropEvents, existingBombs);
 
         // 5. players evolution
         Map<PlayerID, Bonus> playerBonuses = mapPlayersToBonuses(consumedBonuses);
-        Set<Cell> bombedCells1 = GameState.bombedCells(bombs).keySet();
+        Set<Cell> bombedCells1 = GameState.bombedCells(bombs1).keySet();
         List<Player> players1 = GameState.nextPlayers(
                 this.players, playerBonuses, bombedCells1, board1, blastedCells1, speedChangeEvents);
 
-        return new GameState(this.ticks, board1, players1, bombs, explosions1, blasts1);
+        return new GameState(this.ticks, board1, players1, bombs1, explosions1, blasts1);
     }
 
     /**
@@ -523,19 +550,6 @@ public final class GameState {
         return bombDropMap.isEmpty() ? EnumSet.noneOf(PlayerID.class) : EnumSet.copyOf(bombDropMap.values());
     }
 
-    /**
-     * Returns a list of exploding bombs (reached by a blast or consumed fuse).
-     *
-     * @param bombs        the list of bombs
-     * @param blastedCells the set of blasted cells
-     * @return the list of exploding bombs
-     */
-    private List<Bomb> filterExplodingBombs(List<Bomb> bombs, Set<Cell> blastedCells) {
-        return bombs.stream()
-                .filter(b -> blastedCells.contains(b.position()) || b.fuseLength() == 0)
-                .collect(Collectors.toList());
-    }
-
     @Override
     public String toString() {
         return "GameState{" +