RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

fix two cases where it could get stuck indefinitely

This commit is contained in:
Leijurv 2023-07-30 23:24:04 -07:00
parent 36df7b17f8
commit 134bfb2a16
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/baritone/process/ElytraProcess.java
View File

@ -149,9 +149,7 @@ public class ElytraProcess extends BaritoneProcessHelper implements IBaritonePro
if (ctx.player().posY < endPos.y - LANDING_COLUMN_HEIGHT) { if (ctx.player().posY < endPos.y - LANDING_COLUMN_HEIGHT) {
logDirect("bad landing spot, trying again..."); logDirect("bad landing spot, trying again...");
badLandingSpots.add(endPos); landingSpotIsBad(endPos);
goingToLandingSpot = false;
this.state = State.FLYING;
} }
} }
} }
@ -245,6 +243,13 @@ public class ElytraProcess extends BaritoneProcessHelper implements IBaritonePro
return new PathingCommand(null, PathingCommandType.CANCEL_AND_SET_GOAL); return new PathingCommand(null, PathingCommandType.CANCEL_AND_SET_GOAL);
} }
public void landingSpotIsBad(BetterBlockPos endPos) {
badLandingSpots.add(endPos);
goingToLandingSpot = false;
this.landingSpot = null;
this.state = State.FLYING;
}
@Override @Override
public void onLostControl() { public void onLostControl() {
this.goal = null; this.goal = null;

10
src/main/java/baritone/process/elytra/ElytraBehavior.java
View File

@ -219,8 +219,9 @@ public final class ElytraBehavior implements Helper {
this.recalculating = true; this.recalculating = true;
final List<BetterBlockPos> before = this.path.subList(0, afterIncl + 1); final List<BetterBlockPos> before = this.path.subList(0, afterIncl + 1);
final long start = System.nanoTime(); final long start = System.nanoTime();
final BetterBlockPos pathStart = this.path.get(afterIncl);
this.path0(this.path.get(afterIncl), ElytraBehavior.this.destination, segment -> segment.prepend(before.stream())) this.path0(pathStart, ElytraBehavior.this.destination, segment -> segment.prepend(before.stream()))
.thenRun(() -> { .thenRun(() -> {
final int recompute = this.path.size() - before.size() - 1; final int recompute = this.path.size() - before.size() - 1;
final double distance = this.path.get(0).distanceTo(this.path.get(recompute)); final double distance = this.path.get(0).distanceTo(this.path.get(recompute));
@ -237,6 +238,10 @@ public final class ElytraBehavior implements Helper {
final Throwable cause = ex.getCause(); final Throwable cause = ex.getCause();
if (cause instanceof PathCalculationException) { if (cause instanceof PathCalculationException) {
logDirect("Failed to compute next segment"); logDirect("Failed to compute next segment");
if (ctx.player().getDistanceSq(pathStart) < 16 * 16) {
logDirect("Player is near the segment start, therefore repeating this calculation is pointless. Marking as complete");
completePath = true;
}
} else { } else {
logUnhandledException(cause); logUnhandledException(cause);
} }
@ -260,6 +265,9 @@ public final class ElytraBehavior implements Helper {
BlockPos last = !path.isEmpty() ? path.get(path.size() - 1) : null; BlockPos last = !path.isEmpty() ? path.get(path.size() - 1) : null;
if (last != null && ElytraBehavior.this.clearView(new Vec3d(dest), new Vec3d(last), false)) { if (last != null && ElytraBehavior.this.clearView(new Vec3d(dest), new Vec3d(last), false)) {
path.add(new BetterBlockPos(dest)); path.add(new BetterBlockPos(dest));
} else {
logDirect("unable to land at " + ElytraBehavior.this.destination);
process.landingSpotIsBad(new BetterBlockPos(ElytraBehavior.this.destination));
} }
} }
this.path = new NetherPath(path); this.path = new NetherPath(path);