0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

can still fall into water if assumeWalkOnWater is true

Browse Source
This commit is contained in:
Leijurv 2018-09-15 07:51:46 -07:00
parent 9b375e1f5f
commit 19b47d77e5
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/baritone/pathing/movement/movements/MovementFall.java
View File

@ -60,7 +60,8 @@ public class MovementFall extends Movement {
return COST_INF; // falling onto a half slab is really glitchy, and can cause more fall damage than we'd expect return COST_INF; // falling onto a half slab is really glitchy, and can cause more fall damage than we'd expect
} }
double placeBucketCost = 0.0; double placeBucketCost = 0.0;
if (!BlockStateInterface.isWater(dest) && src.getY() - dest.getY() > context.maxFallHeightNoWater()) { boolean destIsWater = BlockStateInterface.isWater(dest);
if (!destIsWater && src.getY() - dest.getY() > context.maxFallHeightNoWater()) {
if (!context.hasWaterBucket()) { if (!context.hasWaterBucket()) {
return COST_INF; return COST_INF;
} }
@ -88,7 +89,14 @@ public class MovementFall extends Movement {
// And falling through signs is possible, but they do have a mining duration, right? // And falling through signs is possible, but they do have a mining duration, right?
if (MovementHelper.getMiningDurationTicks(context, positionsToBreak[i], false) > 0) { if (MovementHelper.getMiningDurationTicks(context, positionsToBreak[i], false) > 0) {
//can't break while falling //can't break while falling
return COST_INF;
if (i != positionsToBreak.length - 1 || !destIsWater) {
// if we're checking the very last block to mine
// and it's water (so this is a water fall)
// don't consider the cost of "mining" it
// (if assumeWalkOnWater is true, water isn't canWalkThrough)
return COST_INF;
}
} }
} }
return WALK_OFF_BLOCK_COST + FALL_N_BLOCKS_COST[positionsToBreak.length - 1] + placeBucketCost + frontThree; return WALK_OFF_BLOCK_COST + FALL_N_BLOCKS_COST[positionsToBreak.length - 1] + placeBucketCost + frontThree;