Take current SubCell into account when searching for central

1 files changed, 2 insertions, 5 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 22fe233..702fa37 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -283,8 +283,7 @@ public final class GameState {
      * @return the truncated path
      */
     private static Sq<Player.DirectedPosition> pathToNextCentralPosition(Sq<Player.DirectedPosition> p) {
-        return p.tail()
-                .takeWhile(dp -> dp.position().isCentral());
+        return p.takeWhile(dp -> !dp.position().isCentral());
     }
 
     /**
@@ -294,9 +293,7 @@ public final class GameState {
      * @return the next central SubCell
      */
     private static SubCell nextCentralPosition(Sq<Player.DirectedPosition> p) {
-        return p.tail()
-                .findFirst(dp -> dp.position().isCentral())
-                .position();
+        return p.findFirst(dp -> dp.position().isCentral()).position();
     }
 
     /**