2 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
index 0969009..25dc734 100644
--- a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
@@ -67,7 +67,7 @@ public class RobotBlock extends Block {
   }
 
   private void updatePath(Board board, TileVec2 target) {
-    if (!board.getBlockTypeAt(target).isTraversable()) return;
+    if (!board.inside(target) || !board.getBlockTypeAt(target).isTraversable()) return;
     if (pathFinder == null) pathFinder = new PathFinder(board);
     path = new LinkedList<>(pathFinder.findPath(TileVec2.of(pos), target));
   }
diff --git a/src/main/java/fr/umlv/java/wallj/board/Board.java b/src/main/java/fr/umlv/java/wallj/board/Board.java
index 5677c39..2e67c53 100644
--- a/src/main/java/fr/umlv/java/wallj/board/Board.java
+++ b/src/main/java/fr/umlv/java/wallj/board/Board.java
@@ -71,6 +71,16 @@ public final class Board {
   }
 
   /**
+   * @param v a tile vector
+   * @return T(v is a valid position of an element within the board)
+   */
+  public boolean inside(TileVec2 v) {
+    TileVec2 dim = getDim();
+    return v.getRow() >= 0 && v.getCol() >= 0 &&
+           v.getRow() < dim.getRow() && v.getCol() < dim.getCol();
+  }
+
+  /**
    * @return a stream of block types and their associated tile position vectors
    */
   public Stream<Map.Entry<TileVec2, BlockType>> stream() {