From 08fb99cabd3171cf9036c0d0d5cba0f4c85b029e Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 22 Sep 2022 13:39:46 -0400
Subject: [PATCH] v1.4.0: fixed bugs with new 'wait to trample' logic

---
 .../shatteredpixeldungeon/actors/hero/Hero.java             | 6 +++---
 1 file changed, 3 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 8f2389dc0..1a4e8a739 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,9 @@ public class Hero extends Char {
 		if (getCloser( action.dst )) {
 			return true;
 
-		//Hero moves in place if there is a trap to trigger or grass to trample
-		} else if (!rooted &&
-					(Dungeon.level.traps.get(pos) != null || Dungeon.level.map[pos] == Terrain.HIGH_GRASS)){
+		//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)){
 			Dungeon.level.pressCell(pos);
 			spendAndNext( 1 / speed() );
 			return false;