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

no need to calculate the hash on contstruction anymore

Browse Source
This commit is contained in:
Leijurv 2018-10-03 07:43:45 -07:00
parent 38895beb5d
commit 04d210bd8b
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,7 +352,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
} else { } else {
timeout = Baritone.settings().planAheadTimeoutMS.<Long>get(); timeout = Baritone.settings().planAheadTimeoutMS.<Long>get();
} }
Optional<HashSet<Long>> favoredPositions = previous.map(IPath::positions).map(Collection::stream).map(x -> x.map(y -> y.hashCode)).map(x -> x.collect(Collectors.toList())).map(HashSet::new); // <-- okay this is EPIC Optional<HashSet<Long>> favoredPositions = previous.map(IPath::positions).map(Collection::stream).map(x -> x.map(BetterBlockPos::longHash)).map(x -> x.collect(Collectors.toList())).map(HashSet::new); // <-- okay this is EPIC
try { try {
IPathFinder pf = new AStarPathFinder(start, goal, favoredPositions); IPathFinder pf = new AStarPathFinder(start, goal, favoredPositions);
return pf.calculate(timeout); return pf.calculate(timeout);
@ -367,15 +367,17 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
if (!Baritone.settings().cancelOnGoalInvalidation.get()) { if (!Baritone.settings().cancelOnGoalInvalidation.get()) {
return; return;
} }
if (current == null || goal == null) { synchronized (pathPlanLock) {
return; if (current == null || goal == null) {
} return;
Goal intended = current.getPath().getGoal(); }
BlockPos end = current.getPath().getDest(); Goal intended = current.getPath().getGoal();
if (intended.isInGoal(end) && !goal.isInGoal(end)) { BlockPos end = current.getPath().getDest();
// this path used to end in the goal if (intended.isInGoal(end) && !goal.isInGoal(end)) {
// but the goal has changed, so there's no reason to continue... // this path used to end in the goal
cancel(); // but the goal has changed, so there's no reason to continue...
cancel();
}
} }
} }

11
src/main/java/baritone/utils/pathing/BetterBlockPos.java
View File

@ -36,14 +36,12 @@ public final class BetterBlockPos extends BlockPos {
public final int x; public final int x;
public final int y; public final int y;
public final int z; public final int z;
public final long hashCode;
public BetterBlockPos(int x, int y, int z) { public BetterBlockPos(int x, int y, int z) {
super(x, y, z); super(x, y, z);
this.x = x; this.x = x;
this.y = y; this.y = y;
this.z = z; this.z = z;
this.hashCode = AbstractNodeCostSearch.posHash(x, y, z);
} }
public BetterBlockPos(double x, double y, double z) { public BetterBlockPos(double x, double y, double z) {
@ -56,7 +54,11 @@ public final class BetterBlockPos extends BlockPos {
@Override @Override
public int hashCode() { public int hashCode() {
return (int) hashCode; return (int) AbstractNodeCostSearch.posHash(x, y, z);
}
public static long longHash(BetterBlockPos pos) {
return AbstractNodeCostSearch.posHash(pos.x, pos.y, pos.z);
} }
@Override @Override
@ -66,9 +68,6 @@ public final class BetterBlockPos extends BlockPos {
} }
if (o instanceof BetterBlockPos) { if (o instanceof BetterBlockPos) {
BetterBlockPos oth = (BetterBlockPos) o; BetterBlockPos oth = (BetterBlockPos) o;
if (oth.hashCode != hashCode) {
return false;
}
return oth.x == x && oth.y == y && oth.z == z; return oth.x == x && oth.y == y && oth.z == z;
} }
// during path execution, like "if (whereShouldIBe.equals(whereAmI)) {" // during path execution, like "if (whereShouldIBe.equals(whereAmI)) {"