From afebdce1f82969a79d029222fc485668be16c094 Mon Sep 17 00:00:00 2001
From: Leijurv <leijurv@gmail.com>
Date: Thu, 25 Jul 2019 16:02:29 -0700
Subject: [PATCH] fix crash and ice behavior

---
 .../java/baritone/pathing/movement/MovementHelper.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java
index 8ce984fb9..e62fcd732 100644
--- a/src/main/java/baritone/pathing/movement/MovementHelper.java
+++ b/src/main/java/baritone/pathing/movement/MovementHelper.java
@@ -498,7 +498,14 @@ public interface MovementHelper extends ActionCosts, Helper {
     }
 
     static boolean isBlockNormalCube(BlockState state) {
-        return state.isNormalCube(null, null);
+        Block block = state.getBlock();
+        if (block instanceof BambooBlock
+                || block instanceof MovingPistonBlock
+                || block instanceof ScaffoldingBlock
+                || block instanceof ShulkerBoxBlock) {
+            return false;
+        }
+        return Block.isOpaque(state.getCollisionShape(null, null));
     }
 
     static PlaceResult attemptToPlaceABlock(MovementState state, IBaritone baritone, BlockPos placeAt, boolean preferDown) {