1 files changed, 11 insertions, 14 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index c58a911..3495af1 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -240,30 +240,27 @@ public final class GameState {
 
     /**
      * 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.
      *
      * @param players0       the previous player states
      * @param bombDropEvents the bomb drop events
      * @param bombs0         the previous bomb state
      * @return the newly dropped bombs
      */
-    private static List<Bomb> newlyDroppedBombs(
-            List<Player> players0,
-            Set<PlayerID> bombDropEvents,
-            List<Bomb> bombs0) {
+    private static List<Bomb> newlyDroppedBombs(List<Player> players0, Set<PlayerID> bombDropEvents, List<Bomb> bombs0) {
+        Set<Cell> bombedCells = GameState.bombedCells(bombs0).keySet();
+
         List<Bomb> bombs1 = new ArrayList<>();
-        Set<Cell> containingBombCells = new HashSet<>();
 
-        for (Bomb bomb : bombs0) {
-            containingBombCells.add(bomb.position());
-        }
+        for (Player p : GameState.alivePlayers(players0)) {
+            if (!bombDropEvents.contains(p.id())) continue;
+            if (bombedCells.contains(p.position().containingCell())) continue;
 
-        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);
-            }
+            Bomb b = new Bomb(p.id(), p.position().containingCell(), Ticks.BOMB_FUSE_TICKS, p.bombRange());
+            bombedCells.add(b.position());
+            bombs1.add(b);
         }
+
         return bombs1;
     }