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

Narrowed scope and we now only call canSprintFromDescendInto when our next & next_next movements are both MovementDescends

Browse Source
This commit is contained in:
Echocage 2022-06-29 17:54:28 -05:00
parent 57c4f9e103
commit 441dceb731
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/baritone/pathing/path/PathExecutor.java
View File

@ -73,8 +73,8 @@ public class PathExecutor implements IPathExecutor, Helper {
private HashSet<BlockPos> toPlace = new HashSet<>(); private HashSet<BlockPos> toPlace = new HashSet<>();
private HashSet<BlockPos> toWalkInto = new HashSet<>(); private HashSet<BlockPos> toWalkInto = new HashSet<>();
private PathingBehavior behavior; private final PathingBehavior behavior;
private IPlayerContext ctx; private final IPlayerContext ctx;
private boolean sprintNextTick; private boolean sprintNextTick;
@ -385,7 +385,7 @@ public class PathExecutor implements IPathExecutor, Helper {
return false; return false;
} }
if (pathPosition < path.length() - 3) { if (pathPosition < path.length() - 2) {
IMovement next = path.movements().get(pathPosition + 1); IMovement next = path.movements().get(pathPosition + 1);
if (next instanceof MovementAscend && current.getDirection().up().equals(next.getDirection().down())) { if (next instanceof MovementAscend && current.getDirection().up().equals(next.getDirection().down())) {
// a descend then an ascend in the same direction // a descend then an ascend in the same direction
@ -396,13 +396,21 @@ public class PathExecutor implements IPathExecutor, Helper {
logDebug("Skipping descend to straight ascend"); logDebug("Skipping descend to straight ascend");
return true; return true;
} }
if (canSprintFromDescendInto(ctx, current, next) && if (canSprintFromDescendInto(ctx, current, next)) {
canSprintFromDescendInto(ctx, next, path.movements().get(pathPosition + 2))) {
if (next instanceof MovementDescend && pathPosition < path.length() - 3) {
IMovement next_next = path.movements().get(pathPosition + 2);
if (next_next instanceof MovementDescend && !canSprintFromDescendInto(ctx, next, next_next)) {
return false;
}
}
if (ctx.playerFeet().equals(current.getDest())) { if (ctx.playerFeet().equals(current.getDest())) {
pathPosition++; pathPosition++;
onChangeInPathPosition(); onChangeInPathPosition();
onTick(); onTick();
} }
return true; return true;
} }
//logDebug("Turning off sprinting " + movement + " " + next + " " + movement.getDirection() + " " + next.getDirection().down() + " " + next.getDirection().down().equals(movement.getDirection())); //logDebug("Turning off sprinting " + movement + " " + next + " " + movement.getDirection() + " " + next.getDirection().down() + " " + next.getDirection().down().equals(movement.getDirection()));