From b8412b6765ba8d0e18cffe24bcbdeb0f4c307eb0 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sat, 7 Mar 2015 17:06:05 -0500
Subject: [PATCH] v0.2.4c: added null check to sprite linking

---
 .../shatteredpixeldungeon/sprites/CharSprite.java            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
index df3988cdd..83d6d6b4a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
@@ -99,8 +99,9 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 		
 		place( ch.pos );
 		turnTo( ch.pos, Random.Int( Level.LENGTH ) );
-		
-		ch.updateSpriteState();
+
+        if (parent != null)
+		    ch.updateSpriteState();
 	}
 	
 	public PointF worldToCamera( int cell ) {