Fix shoals tides being arrested on squares with items that cannot be moved to an adjacent square.

1 files changed, 5 insertions, 4 deletions

diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc
index 0215afd81f..a3a2b12ea9 100644
--- a/crawl-ref/source/dgn-shoals.cc
+++ b/crawl-ref/source/dgn-shoals.cc
@@ -561,10 +561,11 @@ static bool _shoals_tide_sweep_items_clear(coord_def c)
         return true;
 
     const coord_def target(_shoals_escape_place_from(c, false));
-    if (target.origin())
-        return false;
-
-    move_item_stack_to_grid(c, target);
+    // Don't abort tide entry because of items. If we can't sweep the
+    // item clear here, let dungeon_terrain_changed teleport the item
+    // to the nearest safe square.
+    if (!target.origin())
+        move_item_stack_to_grid(c, target);
     return true;
 }