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

Refactor out WanderGoal

Browse Source
This commit is contained in:
fullwall 2013-03-11 16:22:14 +08:00
parent 8930e25fbe
commit bcb7672246
1 changed files with 3 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,15 @@
package net.citizensnpcs.trait.waypoint; package net.citizensnpcs.trait.waypoint;
import java.util.Random;
import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.ai.Goal; import net.citizensnpcs.api.ai.Goal;
import net.citizensnpcs.api.ai.GoalSelector; import net.citizensnpcs.api.ai.goals.WanderGoal;
import net.citizensnpcs.api.ai.event.NavigationCompleteEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.api.util.DataKey;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
public class WanderWaypointProvider implements WaypointProvider { public class WanderWaypointProvider implements WaypointProvider {
private WanderGoal currentGoal; private Goal currentGoal;
private NPC npc;
private volatile boolean paused; private volatile boolean paused;
private int xrange, yrange; private int xrange, yrange;
@ -51,9 +43,8 @@ public class WanderWaypointProvider implements WaypointProvider {
@Override @Override
public void onSpawn(NPC npc) { public void onSpawn(NPC npc) {
this.npc = npc;
if (currentGoal == null) { if (currentGoal == null) {
currentGoal = new WanderGoal(); currentGoal = WanderGoal.createWithNPC(npc);
CitizensAPI.registerEvents(currentGoal); CitizensAPI.registerEvents(currentGoal);
} }
npc.getDefaultGoalController().addGoal(currentGoal, 1); npc.getDefaultGoalController().addGoal(currentGoal, 1);
@ -70,60 +61,6 @@ public class WanderWaypointProvider implements WaypointProvider {
this.paused = paused; this.paused = paused;
} }
private class WanderGoal implements Goal {
private final Random random = new Random();
private GoalSelector selector;
private Location findRandomPosition() {
Location base = npc.getBukkitEntity().getLocation();
Location found = null;
int range = 10;
int yrange = 2;
for (int i = 0; i < 10; i++) {
int x = base.getBlockX() + random.nextInt(2 * range) - range;
int y = base.getBlockY() + random.nextInt(2 * yrange) - yrange;
int z = base.getBlockZ() + random.nextInt(2 * range) - range;
Block block = base.getWorld().getBlockAt(x, y, z);
if (block.isEmpty() && block.getRelative(BlockFace.DOWN).isEmpty()) {
found = block.getLocation();
break;
}
}
return found;
}
@EventHandler
public void onFinish(NavigationCompleteEvent event) {
if (selector != null)
selector.finish();
}
@Override
public void reset() {
selector = null;
}
@Override
public void run(GoalSelector selector) {
if (!npc.getNavigator().isNavigating())
selector.finish();
}
@Override
public boolean shouldExecute(GoalSelector selector) {
if (!npc.isSpawned() || paused || npc.getNavigator().isNavigating())
return false;
Location dest = findRandomPosition();
if (dest == null)
return false;
npc.getNavigator().setTarget(dest);
this.selector = selector;
return true;
}
}
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;
} }