From 1b2a0eafd75905a5083dfba97d8af1aa6b75aec9 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 1 Jun 2017 01:53:27 -0400
Subject: [PATCH] v0.6.0: added a safety check to actor logic

---
 .../com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
index 3dbe9dca1..3822dfec6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
@@ -216,6 +216,7 @@ public abstract class Actor implements Bundlable {
 				
 				doNext = !Thread.interrupted()
 						&& acting != null
+						&& Dungeon.hero != null
 						&& acting.act();
 				
 				if (doNext && !Dungeon.hero.isAlive()) {