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

Add fallback wander goal

Browse Source
This commit is contained in:
fullwall 2019-01-19 15:31:38 +08:00
parent a0aaefcbea
commit e61af2d351
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,14 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import com.google.common.base.Function;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.ForwardingList; import com.google.common.collect.ForwardingList;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.ai.goals.WanderGoal; import net.citizensnpcs.api.ai.goals.WanderGoal;
import net.citizensnpcs.api.astar.pathfinder.MinecraftBlockExaminer;
import net.citizensnpcs.api.command.CommandContext; import net.citizensnpcs.api.command.CommandContext;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.persistence.Persist; import net.citizensnpcs.api.persistence.Persist;
@ -29,7 +31,7 @@ import net.citizensnpcs.api.util.cuboid.QuadTree;
import net.citizensnpcs.util.Messages; import net.citizensnpcs.util.Messages;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
public class WanderWaypointProvider implements WaypointProvider, Supplier<QuadTree> { public class WanderWaypointProvider implements WaypointProvider, Supplier<QuadTree>, Function<NPC, Location> {
private WanderGoal currentGoal; private WanderGoal currentGoal;
private NPC npc; private NPC npc;
private volatile boolean paused; private volatile boolean paused;
@ -41,6 +43,24 @@ public class WanderWaypointProvider implements WaypointProvider, Supplier<QuadTr
@Persist @Persist
public int yrange = DEFAULT_YRANGE; public int yrange = DEFAULT_YRANGE;
@Override
public Location apply(NPC npc) {
Location closestCentre = null;
double minDist = Double.MAX_VALUE;
for (Location centre : regionCentres) {
double d = centre.distanceSquared(npc.getStoredLocation());
if (d > minDist) {
minDist = d;
closestCentre = centre;
}
}
if (closestCentre != null) {
// TODO: should find closest edge block that is valid
return MinecraftBlockExaminer.findValidLocation(closestCentre, xrange, yrange);
}
return null;
}
@Override @Override
public WaypointEditor createEditor(final CommandSender sender, CommandContext args) { public WaypointEditor createEditor(final CommandSender sender, CommandContext args) {
return new WaypointEditor() { return new WaypointEditor() {
@ -184,7 +204,8 @@ public class WanderWaypointProvider implements WaypointProvider, Supplier<QuadTr
public void onSpawn(NPC npc) { public void onSpawn(NPC npc) {
this.npc = npc; this.npc = npc;
if (currentGoal == null) { if (currentGoal == null) {
currentGoal = WanderGoal.createWithNPCAndRangeAndTree(npc, xrange, yrange, WanderWaypointProvider.this); currentGoal = WanderGoal.createWithNPCAndRangeAndTreeAndFallback(npc, xrange, yrange,
WanderWaypointProvider.this, WanderWaypointProvider.this);
} }
npc.getDefaultGoalController().addGoal(currentGoal, 1); npc.getDefaultGoalController().addGoal(currentGoal, 1);
} }
@ -241,5 +262,6 @@ public class WanderWaypointProvider implements WaypointProvider, Supplier<QuadTr
} }
private static final int DEFAULT_XRANGE = 3; private static final int DEFAULT_XRANGE = 3;
private static final int DEFAULT_YRANGE = 25; private static final int DEFAULT_YRANGE = 25;
} }