From ba5bd256bcf2840f41d10ba0cd379e1d13916e47 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 26 Sep 2022 17:30:01 -0400
Subject: [PATCH] v1.4.0: fixed new movement logic incorrectly interacting with
 hourglass

---
 .../shatteredpixeldungeon/actors/hero/Hero.java              | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 1a4e8a739..52a813f78 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
@@ -771,9 +771,8 @@ public class Hero extends Char {
 		if (getCloser( action.dst )) {
 			return true;
 
-		//Hero moves in place if there is an active trap to trigger or grass to trample
-		} else if (!rooted && !flying &&
-					(Dungeon.level.map[pos] == Terrain.TRAP || Dungeon.level.map[pos] == Terrain.HIGH_GRASS)){
+		//Hero moves in place if there is high grass to trample
+		} else if (!rooted && !flying && Dungeon.level.map[pos] == Terrain.HIGH_GRASS){
 			Dungeon.level.pressCell(pos);
 			spendAndNext( 1 / speed() );
 			return false;