1 files changed, 18 insertions, 0 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 16cb01b..a5e1378 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -207,6 +207,24 @@ public final class GameState {
         return new GameState(this.ticks + 1, board1, players1, bombs1, explosions1, blasts1);
     }
 
+    /**
+     * Computes and returns the game state for the next tick, given the current state and the given events.
+     *
+     * @param playerActions the player actions map
+     * @return the next game state
+     */
+    public GameState next(Map<PlayerID, PlayerAction> playerActions) {
+        Map<PlayerID, Optional<Direction>> speedChangeEvents = playerActions.entrySet().stream()
+                .filter(e -> Objects.nonNull(e.getValue().associatedSpeedChangeEvent()))
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().associatedSpeedChangeEvent()));
+
+        Set<PlayerID> bombDropEvents = playerActions.entrySet().stream()
+                .filter(e -> e.getValue() == PlayerAction.DROP_BOMB)
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toSet());
+
+        return this.next(speedChangeEvents, bombDropEvents);
+    }
 
     /**
      * Returns a mapping of players from their location.