From e4e12f74dd5b220d3fe672223c0a94b5998d4466 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 17 Jan 2015 04:00:05 -0500 Subject: [PATCH] v0.2.3e: fixed a bug where pushing a shopkeeper would cause a crash --- .../shatteredpixeldungeon/effects/Pushing.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java index b62831ba4..d7af54823 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java @@ -72,8 +72,9 @@ public class Pushing extends Actor { acc.set( -speed.x / DELAY, -speed.y / DELAY ); delay = 0; - - sprite.parent.add( this ); + + if (sprite.parent != null) + sprite.parent.add( this ); } @Override