1 files changed, 7 insertions, 6 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 32edf5d..f4d021c 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -456,12 +456,13 @@ public final class GameState {
      * @return the conflict-free set of bomb drop events
      */
     private Set<PlayerID> discardConflictingBombDropEvents(Set<PlayerID> bombDropEvents) {
-        return EnumSet.copyOf(
-                this.mapTopPriorityPlayerCells(
-                        this.alivePlayers().stream()
-                                .filter(bombDropEvents::contains)
-                                .collect(Collectors.toList())
-                ).values());
+        Map<Cell, PlayerID> bombDropMap = this.mapTopPriorityPlayerCells(
+                this.alivePlayers().stream()
+                .filter(bombDropEvents::contains)
+                .collect(Collectors.toList())
+        );
+
+        return bombDropMap.isEmpty() ? EnumSet.noneOf(PlayerID.class) : EnumSet.copyOf(bombDropMap.values());
     }
 
     /**