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

Merge pull request #2481 from ZacSharp/buildRepeatCrash

Browse Source 
Don't crash by buildRepeating too often
This commit is contained in:
Leijurv 2021-02-19 10:49:06 -08:00 committed by GitHub
commit 6035a01019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/baritone/process/BuilderProcess.java
View File

@ -343,6 +343,13 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
@Override @Override
public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) { public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
return onTick(calcFailed, isSafeToCancel, 0);
}
public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel, int recursions) {
if (recursions > 1000) { // onTick calls itself, don't crash
return new PathingCommand(null, PathingCommandType.SET_GOAL_AND_PATH);
}
approxPlaceable = approxPlaceable(36); approxPlaceable = approxPlaceable(36);
if (baritone.getInputOverrideHandler().isInputForcedDown(Input.CLICK_LEFT)) { if (baritone.getInputOverrideHandler().isInputForcedDown(Input.CLICK_LEFT)) {
ticks = 5; ticks = 5;
@ -401,7 +408,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
if (Baritone.settings().buildInLayers.value && layer < realSchematic.heightY()) { if (Baritone.settings().buildInLayers.value && layer < realSchematic.heightY()) {
logDirect("Starting layer " + layer); logDirect("Starting layer " + layer);
layer++; layer++;
return onTick(calcFailed, isSafeToCancel); return onTick(calcFailed, isSafeToCancel, recursions + 1);
} }
Vec3i repeat = Baritone.settings().buildRepeat.value; Vec3i repeat = Baritone.settings().buildRepeat.value;
int max = Baritone.settings().buildRepeatCount.value; int max = Baritone.settings().buildRepeatCount.value;
@ -418,7 +425,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
layer = 0; layer = 0;
origin = new BlockPos(origin).add(repeat); origin = new BlockPos(origin).add(repeat);
logDirect("Repeating build in vector " + repeat + ", new origin is " + origin); logDirect("Repeating build in vector " + repeat + ", new origin is " + origin);
return onTick(calcFailed, isSafeToCancel); return onTick(calcFailed, isSafeToCancel, recursions + 1);
} }
if (Baritone.settings().distanceTrim.value) { if (Baritone.settings().distanceTrim.value) {
trim(); trim();
@ -488,7 +495,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
if (Baritone.settings().skipFailedLayers.value && Baritone.settings().buildInLayers.value && layer < realSchematic.heightY()) { if (Baritone.settings().skipFailedLayers.value && Baritone.settings().buildInLayers.value && layer < realSchematic.heightY()) {
logDirect("Skipping layer that I cannot construct! Layer #" + layer); logDirect("Skipping layer that I cannot construct! Layer #" + layer);
layer++; layer++;
return onTick(calcFailed, isSafeToCancel); return onTick(calcFailed, isSafeToCancel, recursions + 1);
} }
logDirect("Unable to do it. Pausing. resume to resume, cancel to cancel"); logDirect("Unable to do it. Pausing. resume to resume, cancel to cancel");
paused = true; paused = true;