1 files changed, 14 insertions, 0 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 8a9d5a9..3d14bd0 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -81,6 +81,16 @@ public final class GameState {
     }
 
     /**
+     * Maps bombs to their owning player ID.
+     *
+     * @param b the list of bombs
+     * @return the mapping
+     */
+    private static Map<PlayerID, List<Bomb>> mapBombsToPlayers(List<Bomb> b) {
+        return b.stream().collect(Collectors.groupingBy(Bomb::ownerId));
+    }
+
+    /**
      * Returns a set of cells that contains at least one blast in the given blasts sequences.
      *
      * @param blasts the list of blast sequences
@@ -357,12 +367,16 @@ 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());
+        Map<PlayerID, List<Bomb>> bombOwnerMap = GameState.mapBombsToPlayers(bombs0);
         List<Bomb> bombs1 = new ArrayList<>(bombs0);
 
         for (Player p : GameState.alivePlayers(players0)) {
             if (!bombDropEvents.contains(p.id())) continue;
             if (bombedCells.contains(p.position().containingCell())) continue;
 
+            List<Bomb> ownedBombs = bombOwnerMap.get(p.id());
+            if (ownedBombs != null && ownedBombs.size() >= p.maxBombs()) continue;
+
             Bomb b = new Bomb(p.id(), p.position().containingCell(), Ticks.BOMB_FUSE_TICKS, p.bombRange());
             bombedCells.add(b.position());
             bombs1.add(b);