Fix collision calculation for walls and stopped player self starting path

1 files changed, 11 insertions, 7 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 2818f26..7d921ee 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -241,7 +241,7 @@ public final class GameState {
      */
     private static Sq<Player.DirectedPosition> nextPath(Player p0, Direction requestedDir) {
         return GameState.newPath(
-                Player.DirectedPosition.moving(p0.directedPositions().head()),
+                p0.directedPositions(),
                 GameState.nextDirection(p0, requestedDir));
     }
 
@@ -253,10 +253,13 @@ public final class GameState {
      * @return the new path
      */
     private static Sq<Player.DirectedPosition> newPath(Sq<Player.DirectedPosition> p0, Direction newDir) {
+        if (newDir == p0.head().direction())
+            return p0;
+
         if (p0.head().direction().isPerpendicularTo(newDir))
-            return GameState.pivotPath(p0, newDir);
-        else
-            return Player.DirectedPosition.moving(new Player.DirectedPosition(p0.head().position(), newDir));
+            return GameState.pivotPath(Player.DirectedPosition.moving(p0.head()), newDir);
+
+        return Player.DirectedPosition.moving(new Player.DirectedPosition(p0.head().position(), newDir));
     }
 
     /**
@@ -325,12 +328,13 @@ public final class GameState {
      */
     private static boolean isColliding(Sq<Player.DirectedPosition> path, Board board1, Set<Cell> bombedCells1) {
         SubCell nextPos = path.tail().head().position();
-        if (!board1.blockAt(nextPos.containingCell()).canHostPlayer())
+        SubCell nextCentralPos = GameState.nextCentralPosition(path.tail());
+
+        if (!board1.blockAt(nextCentralPos.containingCell()).canHostPlayer())
             return true;
 
-        SubCell nextCentralPos = GameState.nextCentralPosition(path.tail());
         if (bombedCells1.contains(nextCentralPos.containingCell()))
-            if (nextPos.distanceTo(nextCentralPos) <= Board.BOMB_BLOCKING_DISTANCE)
+            if (nextPos.distanceTo(nextCentralPos) <= Board.BOMB_BLOCKING_DISTANCE + 1)
                 return true;
 
         return false;