check world border, fixes #218
This commit is contained in:
parent
76e4a1a649
commit
8a65f43a0b
@ -18,15 +18,16 @@
|
|||||||
package baritone.pathing.calc;
|
package baritone.pathing.calc;
|
||||||
|
|
||||||
import baritone.Baritone;
|
import baritone.Baritone;
|
||||||
|
import baritone.api.pathing.calc.IPath;
|
||||||
import baritone.api.pathing.goals.Goal;
|
import baritone.api.pathing.goals.Goal;
|
||||||
import baritone.api.pathing.movement.ActionCosts;
|
import baritone.api.pathing.movement.ActionCosts;
|
||||||
import baritone.api.pathing.calc.IPath;
|
|
||||||
import baritone.api.utils.BetterBlockPos;
|
import baritone.api.utils.BetterBlockPos;
|
||||||
import baritone.pathing.calc.openset.BinaryHeapOpenSet;
|
import baritone.pathing.calc.openset.BinaryHeapOpenSet;
|
||||||
import baritone.pathing.movement.CalculationContext;
|
import baritone.pathing.movement.CalculationContext;
|
||||||
import baritone.pathing.movement.Moves;
|
import baritone.pathing.movement.Moves;
|
||||||
import baritone.utils.BlockStateInterface;
|
import baritone.utils.BlockStateInterface;
|
||||||
import baritone.utils.Helper;
|
import baritone.utils.Helper;
|
||||||
|
import baritone.utils.pathing.BetterWorldBorder;
|
||||||
import baritone.utils.pathing.MutableMoveResult;
|
import baritone.utils.pathing.MutableMoveResult;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
@ -63,6 +64,7 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
|
|||||||
CalculationContext calcContext = new CalculationContext();
|
CalculationContext calcContext = new CalculationContext();
|
||||||
MutableMoveResult res = new MutableMoveResult();
|
MutableMoveResult res = new MutableMoveResult();
|
||||||
HashSet<Long> favored = favoredPositions.orElse(null);
|
HashSet<Long> favored = favoredPositions.orElse(null);
|
||||||
|
BetterWorldBorder worldBorder = new BetterWorldBorder(world().getWorldBorder());
|
||||||
BlockStateInterface.clearCachedChunk();
|
BlockStateInterface.clearCachedChunk();
|
||||||
long startTime = System.nanoTime() / 1000000L;
|
long startTime = System.nanoTime() / 1000000L;
|
||||||
boolean slowPath = Baritone.settings().slowPath.get();
|
boolean slowPath = Baritone.settings().slowPath.get();
|
||||||
@ -106,6 +108,9 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!moves.dynamicXZ && !worldBorder.entirelyContains(newX, newZ)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
res.reset();
|
res.reset();
|
||||||
moves.apply(calcContext, currentNode.x, currentNode.y, currentNode.z, res);
|
moves.apply(calcContext, currentNode.x, currentNode.y, currentNode.z, res);
|
||||||
numMovementsConsidered++;
|
numMovementsConsidered++;
|
||||||
@ -113,6 +118,12 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
|
|||||||
if (actionCost >= ActionCosts.COST_INF) {
|
if (actionCost >= ActionCosts.COST_INF) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (actionCost <= 0) {
|
||||||
|
throw new IllegalStateException(moves + " calculated implausible cost " + actionCost);
|
||||||
|
}
|
||||||
|
if (moves.dynamicXZ && !worldBorder.entirelyContains(res.x, res.z)) { // see issue #218
|
||||||
|
continue;
|
||||||
|
}
|
||||||
// check destination after verifying it's not COST_INF -- some movements return a static IMPOSSIBLE object with COST_INF and destination being 0,0,0 to avoid allocating a new result for every failed calculation
|
// check destination after verifying it's not COST_INF -- some movements return a static IMPOSSIBLE object with COST_INF and destination being 0,0,0 to avoid allocating a new result for every failed calculation
|
||||||
if (!moves.dynamicXZ && (res.x != newX || res.z != newZ)) {
|
if (!moves.dynamicXZ && (res.x != newX || res.z != newZ)) {
|
||||||
throw new IllegalStateException(moves + " " + res.x + " " + newX + " " + res.z + " " + newZ);
|
throw new IllegalStateException(moves + " " + res.x + " " + newX + " " + res.z + " " + newZ);
|
||||||
@ -120,9 +131,6 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
|
|||||||
if (!moves.dynamicY && res.y != currentNode.y + moves.yOffset) {
|
if (!moves.dynamicY && res.y != currentNode.y + moves.yOffset) {
|
||||||
throw new IllegalStateException(moves + " " + res.x + " " + newX + " " + res.z + " " + newZ);
|
throw new IllegalStateException(moves + " " + res.x + " " + newX + " " + res.z + " " + newZ);
|
||||||
}
|
}
|
||||||
if (actionCost <= 0) {
|
|
||||||
throw new IllegalStateException(moves + " calculated implausible cost " + actionCost);
|
|
||||||
}
|
|
||||||
long hashCode = BetterBlockPos.longHash(res.x, res.y, res.z);
|
long hashCode = BetterBlockPos.longHash(res.x, res.y, res.z);
|
||||||
if (favoring && favored.contains(hashCode)) {
|
if (favoring && favored.contains(hashCode)) {
|
||||||
// see issue #18
|
// see issue #18
|
||||||
|
39
src/main/java/baritone/utils/pathing/BetterWorldBorder.java
Normal file
39
src/main/java/baritone/utils/pathing/BetterWorldBorder.java
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of Baritone.
|
||||||
|
*
|
||||||
|
* Baritone is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Baritone is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package baritone.utils.pathing;
|
||||||
|
|
||||||
|
import baritone.utils.Helper;
|
||||||
|
import net.minecraft.world.border.WorldBorder;
|
||||||
|
|
||||||
|
public class BetterWorldBorder implements Helper {
|
||||||
|
double minX;
|
||||||
|
double maxX;
|
||||||
|
double minZ;
|
||||||
|
double maxZ;
|
||||||
|
|
||||||
|
public BetterWorldBorder(WorldBorder border) {
|
||||||
|
this.minX = border.minX();
|
||||||
|
this.maxX = border.maxX();
|
||||||
|
this.minZ = border.minZ();
|
||||||
|
this.maxZ = border.maxZ();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean entirelyContains(int x, int z) {
|
||||||
|
return x + 1 > minX && x < maxX && z + 1 > minZ && z < maxZ;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user