From 2c87715af590192231159dd9f1622a0119d346ad Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 24 Dec 2015 01:22:43 -0500 Subject: [PATCH] v0.3.3a: fixed a nullpointer in disintegration traps --- .../shatteredpixeldungeon/levels/traps/DisintegrationTrap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java index 90fb552ec..b0342819e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java @@ -77,7 +77,7 @@ public class DisintegrationTrap extends Trap { bag = (Bag)item; item = Random.element(bag.items); } - if (item.level() > 0 || item.unique) return; + if (item == null || item.level() > 0 || item.unique) return; if (!item.stackable){ item.detachAll(bag); GLog.w("the trap disintegrates your " + item.name() + "!");