Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-25 03:55:30 +01:00
Code Issues Projects Releases Wiki Activity

Ensure new pathfinder iterates for the max iterations per tick

Browse Source
This commit is contained in:
fullwall 2024-06-18 00:54:54 +08:00
parent 5e9f04f141
commit 6d1aad513e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
View File

@ -50,6 +50,7 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
this.params = params;
destination = dest;
this.npc = npc;
planner = new AStarPlanner(params, npc.getEntity().getLocation(), destination);
}
@Override
@ -77,19 +78,14 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
@Override
public boolean update() {
if (plan == null) {
if (planner == null) {
planner = new AStarPlanner(params, npc.getEntity().getLocation(), destination);
}
if (planner != null) {
CancelReason reason = planner.tick(Setting.ASTAR_ITERATIONS_PER_TICK.asInt(),
Setting.MAXIMUM_ASTAR_ITERATIONS.asInt());
if (reason != null) {
setCancelReason(reason);
}
plan = planner.plan;
if (plan != null) {
planner = null;
}
if (reason == null || plan == null)
return false;
setCancelReason(reason);
planner = null;
}
if (getCancelReason() != null || plan == null || plan.isComplete())
return true;
@ -98,7 +94,7 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
}
Location loc = npc.getEntity().getLocation();
/* Proper door movement - gets stuck on corners at times
Block block = currLoc.getWorld().getBlockAt(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ());
if (MinecraftBlockExaminer.isDoor(block.getType())) {
Door door = (Door) block.getState().getData();