From 992080252f4f7d3523a0ef62170e580c5cc35b64 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 22 Aug 2024 12:57:10 -0400
Subject: [PATCH] v2.5.0: fixed crash errors in new pitfall trap logic

---
 .../shatteredpixeldungeon/levels/traps/PitfallTrap.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
index 8c9e5a7bb..070e001ea 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
@@ -63,7 +63,7 @@ public class PitfallTrap extends Trap {
 		for (int i : PathFinder.NEIGHBOURS9){
 			if (!Dungeon.level.solid[pos+i] || Dungeon.level.passable[pos+i]){
 				CellEmitter.floor(pos+i).burst(PitfallParticle.FACTORY4, 8);
-				positions.add(i);
+				positions.add(pos+i);
 			}
 		}
 		p.setPositions(positions);
@@ -95,7 +95,8 @@ public class PitfallTrap extends Trap {
 			if (depth == Dungeon.depth && branch == Dungeon.branch && positions != null) {
 				for (int cell : positions) {
 
-					if (Dungeon.level.solid[cell] && !Dungeon.level.passable[cell]){
+					if (!Dungeon.level.insideMap(cell)
+							|| (Dungeon.level.solid[cell] && !Dungeon.level.passable[cell])){
 						continue;
 					}