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

revert static cutoff, and fix goal comparisons in splice

Browse Source
This commit is contained in:
Leijurv 2018-12-03 13:34:39 -08:00
parent d2413e1677
commit d058cbf501
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,7 +420,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
} }
CalculationContext context = new CalculationContext(baritone, true); // not safe to create on the other thread, it looks up a lot of stuff in minecraft CalculationContext context = new CalculationContext(baritone, true); // not safe to create on the other thread, it looks up a lot of stuff in minecraft
AbstractNodeCostSearch pathfinder = createPathfinder(start, goal, current == null ? null : current.getPath(), context); AbstractNodeCostSearch pathfinder = createPathfinder(start, goal, current == null ? null : current.getPath(), context);
if (!Objects.equals(pathfinder.getGoal(), goal)) { if (!Objects.equals(pathfinder.getGoal(), goal)) { // will return the exact same object if simplification didn't happen
logDebug("Simplifying " + goal.getClass() + " to GoalXZ due to distance"); logDebug("Simplifying " + goal.getClass() + " to GoalXZ due to distance");
} }
inProgress = pathfinder; inProgress = pathfinder;

2
src/main/java/baritone/pathing/path/SplicedPath.java
View File

@ -71,7 +71,7 @@ public class SplicedPath extends PathBase {
if (second == null || first == null) { if (second == null || first == null) {
return Optional.empty(); return Optional.empty();
} }
if (!Objects.equals(first.getGoal(), second.getGoal())) { if (!first.getGoal().toString().equals(second.getGoal().toString())) {
return Optional.empty(); return Optional.empty();
} }
if (!first.getDest().equals(second.getSrc())) { if (!first.getDest().equals(second.getSrc())) {

2
src/main/java/baritone/process/CustomGoalProcess.java
View File

@ -74,7 +74,7 @@ public class CustomGoalProcess extends BaritoneProcessHelper implements ICustomG
public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) { public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
switch (this.state) { switch (this.state) {
case GOAL_SET: case GOAL_SET:
if (!baritone.getPathingBehavior().isPathing() && Objects.equals(baritone.getPathingBehavior().getGoal(), this.goal)) { if (!baritone.getPathingBehavior().isPathing() && Objects.equals(baritone.getPathingBehavior().getGoal() + "", this.goal + "")) {
this.state = State.NONE; this.state = State.NONE;
} }
return new PathingCommand(this.goal, PathingCommandType.CANCEL_AND_SET_GOAL); return new PathingCommand(this.goal, PathingCommandType.CANCEL_AND_SET_GOAL);

5
src/main/java/baritone/utils/pathing/PathBase.java
View File

@ -39,15 +39,14 @@ public abstract class PathBase implements IPath {
@Override @Override
public PathBase staticCutoff(Goal destination) { public PathBase staticCutoff(Goal destination) {
int min = BaritoneAPI.getSettings().pathCutoffMinimumLength.get(); if (length() < BaritoneAPI.getSettings().pathCutoffMinimumLength.get()) {
if (length() < min) {
return this; return this;
} }
if (destination == null || destination.isInGoal(getDest())) { if (destination == null || destination.isInGoal(getDest())) {
return this; return this;
} }
double factor = BaritoneAPI.getSettings().pathCutoffFactor.get(); double factor = BaritoneAPI.getSettings().pathCutoffFactor.get();
int newLength = (int) ((length() - 1 - min) * factor) + min; int newLength = (int) ((length() - 1) * factor);
return new CutoffPath(this, newLength); return new CutoffPath(this, newLength);
} }
} }