1 files changed, 8 insertions, 2 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 2c6f372..cbe29b5 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -7,6 +7,7 @@ import ch.epfl.xblast.Direction;
 import ch.epfl.xblast.PlayerID;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -205,7 +206,9 @@ public final class GameState {
      * @return the map of bombs
      */
     public Map<Cell, Bomb> bombedCells() {
-        return null; // TODO
+        return this.bombs
+                .stream()
+                .collect(Collectors.toMap(Bomb::position, Function.identity()));
     }
 
     /**
@@ -214,7 +217,10 @@ public final class GameState {
      * @return the set of blasted cells
      */
     public Set<Cell> blastedCells() {
-        return null; // TODO
+        return this.blasts
+                .stream()
+                .map(Sq::head)
+                .collect(Collectors.toSet());
     }
 
     /**