Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-29 22:23:59 +01:00
Code Issues Projects Releases Wiki Activity

Simplify wander

Browse Source
This commit is contained in:
fullwall 2023-05-06 23:10:29 +08:00
parent 35af40a9c5
commit 147a07f413
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
View File

@ -72,21 +72,9 @@ public class WanderWaypointProvider
@Override @Override
public Location apply(NPC npc) { public Location apply(NPC npc) {
Location npcLoc = npc.getStoredLocation();
Location closestCentre = regionCentres.stream()
.min((a, b) -> Double.compare(a.distanceSquared(npcLoc), b.distanceSquared(npcLoc))).orElse(null);
if (closestCentre != null) {
Location random = MinecraftBlockExaminer.findRandomValidLocation(closestCentre, xrange, yrange,
currentGoal.blockFilter(), Util.getFastRandom());
if (random != null)
return random;
// TODO: should find closest edge block that is valid
return MinecraftBlockExaminer.findValidLocation(npc.getStoredLocation(), xrange, yrange, return MinecraftBlockExaminer.findValidLocation(npc.getStoredLocation(), xrange, yrange,
currentGoal.blockFilter()); currentGoal.blockFilter());
} }
return null;
}
@Override @Override
public WaypointEditor createEditor(final CommandSender sender, CommandContext args) { public WaypointEditor createEditor(final CommandSender sender, CommandContext args) {