From 9dd910de02facc176df95ba34b0e1e20e7338f8a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 29 Jan 2017 00:01:32 -0500 Subject: [PATCH] v0.5.0: fixed game crashes involving pitfall traps --- .../shatteredpixeldungeon/actors/hero/Hero.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index f0050657a..6c56659ae 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -1101,8 +1101,11 @@ public class Hero extends Char { move(step); spend( moveTime / speed() ); - - return true; + + //FIXME this is a fairly sloppy fix for a crash involving pitfall traps. + //really there should be a way for traps to specify whether action should continue or + //not when they are pressed. + return InterlevelScene.mode != InterlevelScene.Mode.FALL; } else {