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

reuse calculationcontext for planning ahead next segment

This commit is contained in:
Leijurv 2019-01-10 13:51:26 -08:00
parent 1381d8d94c
commit 81786f7a7c
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/baritone/behavior/PathingBehavior.java
View File

@ -54,6 +54,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
private PathExecutor next; private PathExecutor next;
private Goal goal; private Goal goal;
private CalculationContext context;
private boolean safeToCancel; private boolean safeToCancel;
private boolean pauseRequestedLastTick; private boolean pauseRequestedLastTick;
@ -155,7 +156,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
return; return;
} }
queuePathEvent(PathEvent.CALC_STARTED); queuePathEvent(PathEvent.CALC_STARTED);
findPathInNewThread(pathStart(), true, new CalculationContext(baritone, true)); findPathInNewThread(pathStart(), true, context);
} }
return; return;
} }
@ -190,7 +191,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
// and this path has 5 seconds or less left // and this path has 5 seconds or less left
logDebug("Path almost over. Planning ahead..."); logDebug("Path almost over. Planning ahead...");
queuePathEvent(PathEvent.NEXT_SEGMENT_CALC_STARTED); queuePathEvent(PathEvent.NEXT_SEGMENT_CALC_STARTED);
findPathInNewThread(current.getPath().getDest(), false, new CalculationContext(baritone, true)); findPathInNewThread(current.getPath().getDest(), false, context);
} }
} }
} }
@ -227,13 +228,31 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
public boolean secretInternalSetGoalAndPath(PathingCommand command) { public boolean secretInternalSetGoalAndPath(PathingCommand command) {
secretInternalSetGoal(command.goal); secretInternalSetGoal(command.goal);
CalculationContext context;
if (command instanceof PathingCommandContext) { if (command instanceof PathingCommandContext) {
context = ((PathingCommandContext) command).desiredCalcContext; context = ((PathingCommandContext) command).desiredCalcContext;
} else { } else {
context = new CalculationContext(baritone, true); context = new CalculationContext(baritone, true);
} }
return secretInternalPath(context); if (goal == null) {
return false;
}
BlockPos pathStart = pathStart();
if (goal.isInGoal(ctx.playerFeet()) || goal.isInGoal(pathStart)) {
return false;
}
synchronized (pathPlanLock) {
if (current != null) {
return false;
}
synchronized (pathCalcLock) {
if (inProgress != null) {
return false;
}
queuePathEvent(PathEvent.CALC_STARTED);
findPathInNewThread(pathStart, true, context);
return true;
}
}
} }
@Override @Override
@ -322,33 +341,6 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
inProgress = null; inProgress = null;
} }
/**
* Start calculating a path if we aren't already
*
* @return true if this call started path calculation, false if it was already calculating or executing a path
*/
private boolean secretInternalPath(CalculationContext context) {
if (goal == null) {
return false;
}
if (goal.isInGoal(ctx.playerFeet())) {
return false;
}
synchronized (pathPlanLock) {
if (current != null) {
return false;
}
synchronized (pathCalcLock) {
if (inProgress != null) {
return false;
}
queuePathEvent(PathEvent.CALC_STARTED);
findPathInNewThread(pathStart(), true, context);
return true;
}
}
}
public void secretCursedFunctionDoNotCall(IPath path) { public void secretCursedFunctionDoNotCall(IPath path) {
synchronized (pathPlanLock) { synchronized (pathPlanLock) {
current = new PathExecutor(this, path); current = new PathExecutor(this, path);