Merge branch '1.14.4' into 1.15.2

This commit is contained in:
Leijurv 2022-02-02 00:14:38 -08:00
commit 34501f5af3
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 7 additions and 1 deletions

View File

@ -39,6 +39,7 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockReader;
import java.util.List;
import java.util.Optional;
import static baritone.pathing.movement.Movement.HORIZONTALS_BUT_ALSO_DOWN_____SO_EVERY_DIRECTION_EXCEPT_UP;
@ -522,7 +523,12 @@ public interface MovementHelper extends ActionCosts, Helper {
|| block instanceof ShulkerBoxBlock) {
return false;
}
return Block.isOpaque(state.getCollisionShape(null, null));
try {
return Block.isOpaque(state.getCollisionShape(null, null));
} catch (Exception ignored) {
// if we can't get the collision shape, assume it's bad and add to blocksToAvoid
}
return false;
}
static PlaceResult attemptToPlaceABlock(MovementState state, IBaritone baritone, BlockPos placeAt, boolean preferDown, boolean wouldSneak) {