Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix guided waypoint provider neighbour generation

This commit is contained in:
fullwall 2023-09-17 22:56:33 +08:00
parent 2931f95939
commit 3e7b465a04
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
main/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
View File

@ -18,10 +18,8 @@ import org.bukkit.event.player.PlayerInteractEvent;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import ch.ethz.globis.phtree.PhDistanceL;
import ch.ethz.globis.phtree.PhFilterDistance;
import ch.ethz.globis.phtree.PhRangeQuery;
import ch.ethz.globis.phtree.PhTree;
import ch.ethz.globis.phtree.PhTree.PhKnnQuery;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.ai.Goal;
import net.citizensnpcs.api.ai.GoalSelector;
@ -338,10 +336,12 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
@Override
public void run(GoalSelector selector) {
if (plan == null || plan.isComplete()) {
if (plan.isComplete()) {
target.onReach(npc);
}
if (plan != null && plan.isComplete()) {
target.onReach(npc);
plan = null;
}
if (plan == null) {
selector.finish();
return;
}
@ -435,17 +435,14 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
@Override
public Iterable<AStarNode> getNeighbours() {
PhFilterDistance filter = new PhFilterDistance();
filter.set(
new long[] { waypoint.getLocation().getBlockX(), waypoint.getLocation().getBlockY(),
waypoint.getLocation().getBlockZ() },
PhDistanceL.THIS, distance == -1 ? npc.getNavigator().getDefaultParameters().range() : distance);
PhTree<Waypoint> source = getParent() == null ? tree : treePlusDestinations;
PhKnnQuery<Waypoint> res = source.nearestNeighbour(100, PhDistanceL.THIS, filter,
PhRangeQuery<Waypoint> rq = source.rangeQuery(
distance == -1 ? npc.getNavigator().getDefaultParameters().range() : distance,
waypoint.getLocation().getBlockX(), waypoint.getLocation().getBlockY(),
waypoint.getLocation().getBlockZ());
List<AStarNode> neighbours = Lists.newArrayList();
res.forEachRemaining(n -> neighbours.add(new GuidedNode(this, n)));
rq.forEachRemaining(n -> neighbours.add(new GuidedNode(this, n)));
return neighbours;
}
@ -453,6 +450,11 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
public int hashCode() {
return 31 + ((waypoint == null) ? 0 : waypoint.hashCode());
}
@Override
public String toString() {
return "GuidedNode [" + waypoint + "]";
}
}
private static class GuidedPlan implements Plan {