1 files changed, 13 insertions, 11 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 364a564..65309d5 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -179,11 +179,10 @@ public final class GameState {
                                             Map<PlayerID, Optional<Direction>> speedChangeEvents) {
 
         return players0.stream()
-                .map(p -> {
-                    Optional<Direction> speedChangeEvent = speedChangeEvents.get(p.id());
-                    Direction requestedDirection = speedChangeEvent != null ? speedChangeEvent.orElse(null) : null;
-                    return GameState.nextPlayer(p, playerBonuses.get(p.id()), bombedCells1, board1, blastedCells1, requestedDirection);
-                })
+                .map(p -> GameState.nextPlayer(
+                        p, playerBonuses.get(p.id()),
+                        bombedCells1, board1, blastedCells1,
+                        speedChangeEvents.get(p.id())))
                 .collect(Collectors.toList());
     }
 
@@ -200,7 +199,7 @@ public final class GameState {
      */
     private static Player nextPlayer(Player player0, Bonus playerBonus,
                                      Set<Cell> bombedCells1, Board board1, Set<Cell> blastedCells1,
-                                     Direction requestedDirection) {
+                                     Optional<Direction> requestedDirection) {
 
         // 1. Compute the new path to follow
         Sq<Player.DirectedPosition> updatedPath = GameState.nextPath(player0.directedPositions(), requestedDirection);
@@ -228,14 +227,17 @@ public final class GameState {
      * @param newDir the new requested Direction
      * @return the new path
      */
-    private static Sq<Player.DirectedPosition> nextPath(Sq<Player.DirectedPosition> p0, Direction newDir) {
+    private static Sq<Player.DirectedPosition> nextPath(Sq<Player.DirectedPosition> p0, Optional<Direction> newDir) {
         if (Objects.isNull(newDir))
             return p0;
 
-        if (p0.head().direction().isPerpendicularTo(newDir))
-            return GameState.pivotPath(Player.DirectedPosition.moving(p0.head()), newDir);
+        if (!newDir.isPresent())
+            return Player.DirectedPosition.stopped(p0.head());
 
-        return Player.DirectedPosition.moving(new Player.DirectedPosition(p0.head().position(), newDir));
+        if (p0.head().direction().isPerpendicularTo(newDir.get()))
+            return GameState.pivotPath(Player.DirectedPosition.moving(p0.head()), newDir.get());
+
+        return Player.DirectedPosition.moving(new Player.DirectedPosition(p0.head().position(), newDir.get()));
     }
 
     /**
@@ -304,7 +306,7 @@ public final class GameState {
      */
     private static boolean isColliding(Sq<Player.DirectedPosition> path, Board board1, Set<Cell> bombedCells1) {
         SubCell nextPos = path.tail().head().position();
-        SubCell nextCentralPos = GameState.nextCentralPosition(path.tail());
+        SubCell nextCentralPos = GameState.nextCentralPosition(Player.DirectedPosition.moving(path.tail().head()));
 
         if (!board1.blockAt(nextCentralPos.containingCell()).canHostPlayer())
             return true;