From 77e97b4285e346c70f5f277f30ca2208c7751739 Mon Sep 17 00:00:00 2001 From: leijurv Date: Mon, 20 Aug 2018 07:33:39 -0700 Subject: [PATCH] fix descend and fall onto lilypad --- .../bot/pathing/movement/movements/MovementDescend.java | 2 +- .../baritone/bot/pathing/movement/movements/MovementFall.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java index d7b429a7c..cf282f2f7 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java @@ -69,7 +69,7 @@ public class MovementDescend extends Movement { } BlockPos playerFeet = playerFeet(); if (playerFeet.equals(dest)) { - if (BlockStateInterface.isLiquid(dest) || player().posY - playerFeet.getY() < 0.01) { + if (BlockStateInterface.isLiquid(dest) || player().posY - playerFeet.getY() < 0.094) { // Wait until we're actually on the ground before saying we're done because sometimes we continue to fall if the next action starts immediately state.setStatus(MovementStatus.SUCCESS); return state; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java index 69b509c22..56f073c66 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java @@ -105,7 +105,7 @@ public class MovementFall extends Movement { } else { state.setTarget(new MovementTarget(Utils.calcRotationFromVec3d(playerHead(), Utils.getBlockPosCenter(dest)))); } - if (playerFeet.equals(dest) && (player().posY - playerFeet.getY() < 0.01 + if (playerFeet.equals(dest) && (player().posY - playerFeet.getY() < 0.094 || BlockStateInterface.isWater(dest))) { if (BlockStateInterface.isWater(dest) && player().inventory.hasItemStack(STACK_BUCKET_EMPTY)) { player().inventory.currentItem = player().inventory.getSlotFor(STACK_BUCKET_EMPTY);