From c6d86f42abcf026478b6b3424b7d46d93ffb24e8 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 14 Sep 2016 19:33:12 -0400
Subject: [PATCH] v0.4.2b: fixed game freezes in certain situations

---
 .../com/shatteredpixel/shatteredpixeldungeon/actors/Char.java | 4 +++-
 .../shatteredpixeldungeon/actors/hero/Hero.java               | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
index 2989f7628..8f29d2eff 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
@@ -432,7 +432,9 @@ public abstract class Char extends Actor {
 	}
 	
 	public void onMotionComplete() {
-		next();
+		//Does nothing by default
+		//The main actor thread already accounts for motion,
+		// so calling next() here isn't necessary (see Actor.process)
 	}
 	
 	public void onAttackComplete() {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index a649f0afd..fd43b3e28 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -1400,8 +1400,6 @@ public class Hero extends Char {
 	public void onMotionComplete() {
 		Dungeon.observe();
 		search( false );
-			
-		super.onMotionComplete();
 	}
 	
 	@Override