範囲外の設置禁止

Author: nakomochi

src/ability.ts

@@ -176,8 +176,8 @@ export function canPlaceMovableObject(cx: Context, x: number, y: number, object:
     const positionX = x + i.x;
     const positionY = y + i.y;
     const target = grid.getBlock(cx, positionX, positionY);
-    if (target && target !== Block.switch) {
-      // すでに何かある場合は、ペーストできない
+    if (target === undefined || (target && target !== Block.switch)) {
+      // すでに何かある場合or範囲外は、ペーストできない
       return false;
     }
   }

src/grid.ts

@@ -295,7 +295,10 @@ export class Grid {
     }
     this.oobFallableSprites = [];
   }
-  getBlock(cx: Context, x: number, y: number): Block | null {
+  getBlock(cx: Context, x: number, y: number): Block | null | undefined {
+    const cells = get(cx.state).cells;
+    if (y < 0 || y >= cells.length) return undefined;
+    if (x < 0 || x >= cells[y].length) return undefined;
     return get(cx.state).cells[y]?.[x]?.block ?? null;
   }
   // satisfies: every(MovableObject.relativePositions, (pos) => pos.x >= 0)