Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-04 14:31:19 +01:00
Code Issues Projects Releases Wiki Activity

Avoid caching empty paths

Browse Source
This commit is contained in:
fullwall 2020-11-24 20:34:22 +08:00
parent 4491e95952
commit 2f10ac86cc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
View File

@ -22,6 +22,7 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.util.Vector;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@ -534,7 +535,7 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
SourceDestinationPair key = new SourceDestinationPair(npcLoc, currentDestination);
Iterable<Vector> cached = cachedPaths.get(key);
if (cached != null) {
if (!key.verify(npcLoc.getWorld(), cached)) {
if (Iterables.size(cached) == 0 || !key.verify(npcLoc.getWorld(), cached)) {
cachedPaths.remove(key);
} else {
getNavigator().setTarget(cached);
@ -552,8 +553,10 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
Setting.DEFAULT_DISTANCE_MARGIN.asDouble() + 1)) {
currentDestination.onReach(npc);
if (cachePaths && cancelReason == null) {
cachedPaths.put(new SourceDestinationPair(npcLoc, currentDestination),
getNavigator().getPathStrategy().getPath());
Iterable<Vector> path = getNavigator().getPathStrategy().getPath();
if (Iterables.size(path) > 0) {
cachedPaths.put(new SourceDestinationPair(npcLoc, currentDestination), path);
}
}
}
selector.finish();