konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.5.0: fixed crash errors in new pitfall trap logic

Browse Source
This commit is contained in:
Evan Debenham
2024-08-22 12:57:10 -04:00
parent 1e344ec17f
commit 992080252f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
+3 -2
View File
@@ -63,7 +63,7 @@ public class PitfallTrap extends Trap {
for (int i : PathFinder.NEIGHBOURS9){ for (int i : PathFinder.NEIGHBOURS9){
if (!Dungeon.level.solid[pos+i] || Dungeon.level.passable[pos+i]){ if (!Dungeon.level.solid[pos+i] || Dungeon.level.passable[pos+i]){
CellEmitter.floor(pos+i).burst(PitfallParticle.FACTORY4, 8); CellEmitter.floor(pos+i).burst(PitfallParticle.FACTORY4, 8);
positions.add(i); positions.add(pos+i);
} }
} }
p.setPositions(positions); p.setPositions(positions);
@@ -95,7 +95,8 @@ public class PitfallTrap extends Trap {
if (depth == Dungeon.depth && branch == Dungeon.branch && positions != null) { if (depth == Dungeon.depth && branch == Dungeon.branch && positions != null) {
for (int cell : positions) { 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; continue;
} }