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

sprint through descend then ascend in the same direction, fixes #115

Browse Source
This commit is contained in:
Leijurv 2018-09-28 18:55:04 -07:00
parent 2f602f8718
commit c383186808
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,14 @@ package baritone.pathing.path;
import baritone.Baritone; import baritone.Baritone;
import baritone.api.event.events.TickEvent; import baritone.api.event.events.TickEvent;
import baritone.api.pathing.movement.ActionCosts; import baritone.api.pathing.movement.ActionCosts;
import baritone.pathing.movement.*; import baritone.pathing.movement.CalculationContext;
import baritone.pathing.movement.Movement;
import baritone.pathing.movement.MovementHelper;
import baritone.pathing.movement.MovementState;
import baritone.pathing.movement.movements.*; import baritone.pathing.movement.movements.*;
import baritone.utils.BlockStateInterface; import baritone.utils.BlockStateInterface;
import baritone.utils.Helper; import baritone.utils.Helper;
import baritone.utils.InputOverrideHandler;
import baritone.utils.Utils; import baritone.utils.Utils;
import baritone.utils.pathing.BetterBlockPos; import baritone.utils.pathing.BetterBlockPos;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -320,10 +324,18 @@ public class PathExecutor implements Helper {
} }
Movement next = path.movements().get(pathPosition + 1); Movement next = path.movements().get(pathPosition + 1);
if (next instanceof MovementAscend && current.getDirection().up().equals(next.getDirection().down())) {
// a descend then an ascend in the same direction
if (!player().isSprinting()) {
player().setSprinting(true);
}
pathPosition++;
logDebug("Skipping descend to straight ascend");
return;
}
if (canSprintInto(current, next)) { if (canSprintInto(current, next)) {
if (playerFeet().equals(current.getDest())) { if (playerFeet().equals(current.getDest())) {
pathPosition++; pathPosition++;
clearKeys();
} }
if (!player().isSprinting()) { if (!player().isSprinting()) {
player().setSprinting(true); player().setSprinting(true);
@ -332,6 +344,19 @@ public class PathExecutor implements Helper {
} }
//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()));
} }
if (current instanceof MovementAscend && pathPosition != 0) {
Movement prev = path.movements().get(pathPosition - 1);
if (prev instanceof MovementDescend && prev.getDirection().up().equals(current.getDirection().down())) {
BlockPos center = current.getSrc().up();
if (player().posY >= center.getY()) { // playerFeet adds 0.1251 to account for soul sand
Baritone.INSTANCE.getInputOverrideHandler().setInputForceState(InputOverrideHandler.Input.JUMP, false);
if (!player().isSprinting()) {
player().setSprinting(true);
}
return;
}
}
}
player().setSprinting(false); player().setSprinting(false);
} }