From a72ec8c4765a63fd3786482f58af4e1988849cf1 Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Sun, 3 Jan 2021 19:31:59 -0700
Subject: [PATCH] Fix undoing dropping a bowling ball; make bowling balls
 explode at level edge

---
 js/game.js      | 17 +++++++++++++----
 js/tiletypes.js |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/js/game.js b/js/game.js
index 201661f..c747d9c 100644
--- a/js/game.js
+++ b/js/game.js
@@ -1372,7 +1372,16 @@ export class Level extends LevelInterface {
 
     check_movement(actor, orig_cell, direction, push_mode) {
         let dest_cell = this.get_neighboring_cell(orig_cell, direction);
-        let success = (dest_cell &&
+        if (! dest_cell) {
+            if (push_mode === 'push') {
+                if (actor.type.on_blocked) {
+                    actor.type.on_blocked(actor, this, direction, null);
+                }
+            }
+            return false;
+        }
+
+        let success = (
             orig_cell.try_leaving(actor, direction, this, push_mode) &&
             dest_cell.try_entering(actor, direction, this, push_mode));
 
@@ -1802,7 +1811,7 @@ export class Level extends LevelInterface {
         }
         else {
             // Note that we can't drop a bowling ball if there's already an item, even though a
-            // dropped bowling ball is really an actor (TODO arguably a bug)
+            // dropped bowling ball is really an actor
             if (cell.get_item())
                 return false;
 
@@ -1821,7 +1830,7 @@ export class Level extends LevelInterface {
                 // already in this cell's actor layer.  But we also know for sure that there's no
                 // item in this cell, so we'll cheat a little: remove the dropping actor, set the
                 // item moving, then put the dropping actor back before anyone notices.
-                cell._remove(dropping_actor);
+                this.remove_tile(dropping_actor);
                 this.add_tile(tile, cell);
                 if (! this.attempt_out_of_turn_step(tile, dropping_actor.direction)) {
                     // It was unable to move, so there's nothing we can do but destroy it
@@ -1831,7 +1840,7 @@ export class Level extends LevelInterface {
                 else {
                     this.add_actor(tile);
                 }
-                cell._add(dropping_actor);
+                this.add_tile(dropping_actor, cell);
             }
             else {
                 this.add_tile(tile, cell);
diff --git a/js/tiletypes.js b/js/tiletypes.js
index 676da4d..09a5ace 100644
--- a/js/tiletypes.js
+++ b/js/tiletypes.js
@@ -2343,7 +2343,7 @@ const TILE_TYPES = {
         },
         on_blocked(me, level, direction, obstacle) {
             // Blow up anything we run into
-            if (obstacle.type.is_actor) {
+            if (obstacle && obstacle.type.is_actor) {
                 if (obstacle.type.is_real_player) {
                     level.fail(me.type.name);
                 }