From 7140f1e0fd7d02d92bc96e96c1a3c1bc3821ceac Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 8 Aug 2016 16:42:48 -0400 Subject: [PATCH] v0.4.1a: fixed a crash when stepping on a curse trap with no armor. --- .../shatteredpixeldungeon/levels/traps/CursingTrap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java index 7964846ac..94eccf974 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java @@ -85,7 +85,7 @@ public class CursingTrap extends Trap { } Armor armor = hero.belongings.armor; - if (!armor.cursed){ + if (armor != null && !armor.cursed){ if (armor.glyph == null) priorityCurse.add(armor); else