From eb06f4ff5381d78fb6082739321014180c12ec14 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Tue, 15 Aug 2017 01:06:50 -0400
Subject: [PATCH] v0.6.1: adjusted emoicon handling to prevent null pointers

---
 .../shatteredpixeldungeon/sprites/CharSprite.java      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
index 95924eaa2..af476ab45 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
@@ -429,10 +429,10 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 	}
 	
 	public void showSleep() {
-		if (emo instanceof EmoIcon.Sleep) {
+		if (emo instanceof EmoIcon.Sleep && emo.alive) {
 			
 		} else {
-			if (emo != null) {
+			if (emo != null && emo.alive) {
 				emo.killAndErase();
 			}
 			emo = new EmoIcon.Sleep( this );
@@ -444,15 +444,14 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 	public void hideSleep() {
 		if (emo instanceof EmoIcon.Sleep) {
 			emo.killAndErase();
-			emo = null;
 		}
 	}
 	
 	public void showAlert() {
-		if (emo instanceof EmoIcon.Alert) {
+		if (emo instanceof EmoIcon.Alert && emo.alive) {
 			
 		} else {
-			if (emo != null) {
+			if (emo != null && emo.alive) {
 				emo.killAndErase();
 			}
 			emo = new EmoIcon.Alert( this );
@@ -463,7 +462,6 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 	public void hideAlert() {
 		if (emo instanceof EmoIcon.Alert) {
 			emo.killAndErase();
-			emo = null;
 		}
 	}