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

Add simple chunk ticketing system for pathfinding

Browse Source
This commit is contained in:
fullwall 2021-09-09 18:21:00 +08:00
parent 9f856f0565
commit 7952600382
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
View File

@ -15,6 +15,7 @@ import org.bukkit.util.Vector;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.Settings.Setting;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.ai.EntityTarget; import net.citizensnpcs.api.ai.EntityTarget;
import net.citizensnpcs.api.ai.Navigator; import net.citizensnpcs.api.ai.Navigator;
import net.citizensnpcs.api.ai.NavigatorParameters; import net.citizensnpcs.api.ai.NavigatorParameters;
@ -34,10 +35,12 @@ import net.citizensnpcs.api.astar.pathfinder.MinecraftBlockExaminer;
import net.citizensnpcs.api.astar.pathfinder.SwimmingExaminer; import net.citizensnpcs.api.astar.pathfinder.SwimmingExaminer;
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 net.citizensnpcs.util.ChunkCoord;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
public class CitizensNavigator implements Navigator, Runnable { public class CitizensNavigator implements Navigator, Runnable {
private Location activeTicket;
private final NavigatorParameters defaultParams = new NavigatorParameters().baseSpeed(UNINITIALISED_SPEED) private final NavigatorParameters defaultParams = new NavigatorParameters().baseSpeed(UNINITIALISED_SPEED)
.range(Setting.DEFAULT_PATHFINDING_RANGE.asFloat()).debug(Setting.DEBUG_PATHFINDING.asBoolean()) .range(Setting.DEFAULT_PATHFINDING_RANGE.asFloat()).debug(Setting.DEBUG_PATHFINDING.asBoolean())
.defaultAttackStrategy(MCTargetStrategy.DEFAULT_ATTACK_STRATEGY) .defaultAttackStrategy(MCTargetStrategy.DEFAULT_ATTACK_STRATEGY)
@ -317,8 +320,14 @@ public class CitizensNavigator implements Navigator, Runnable {
velocity.setX(0).setY(0).setZ(0); velocity.setX(0).setY(0).setZ(0);
npc.getEntity().setVelocity(velocity); npc.getEntity().setVelocity(velocity);
} }
Location loc = npc.getEntity().getLocation(STATIONARY_LOCATION); Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
NMS.look(npc.getEntity(), loc.getYaw(), 0); @Override
public void run() {
updateTicket(isNavigating() ? executing.getTargetAsLocation() : null);
}
}, 10);
// Location loc = npc.getEntity().getLocation(STATIONARY_LOCATION);
// NMS.look(npc.getEntity(), loc.getYaw(), 0);
} }
private void stopNavigating(CancelReason reason) { private void stopNavigating(CancelReason reason) {
@ -377,6 +386,7 @@ public class CitizensNavigator implements Navigator, Runnable {
stationaryTicks = 0; stationaryTicks = 0;
if (npc.isSpawned()) { if (npc.isSpawned()) {
NMS.updateNavigationWorld(npc.getEntity(), npc.getEntity().getWorld()); NMS.updateNavigationWorld(npc.getEntity(), npc.getEntity().getWorld());
updateTicket(executing.getTargetAsLocation());
} }
Bukkit.getPluginManager().callEvent(new NavigationBeginEvent(this)); Bukkit.getPluginManager().callEvent(new NavigationBeginEvent(this));
} }
@ -432,6 +442,23 @@ public class CitizensNavigator implements Navigator, Runnable {
return false; return false;
} }
private void updateTicket(Location target) {
if (target != null && this.activeTicket != null
&& new ChunkCoord(target.getChunk()).equals(new ChunkCoord(this.activeTicket.getChunk()))) {
this.activeTicket = target.clone();
return;
}
if (this.activeTicket != null) {
this.activeTicket.getChunk().removePluginChunkTicket(CitizensAPI.getPlugin());
}
if (target == null) {
this.activeTicket = null;
return;
}
this.activeTicket = target.clone();
this.activeTicket.getChunk().addPluginChunkTicket(CitizensAPI.getPlugin());
}
private static final Location STATIONARY_LOCATION = new Location(null, 0, 0, 0); private static final Location STATIONARY_LOCATION = new Location(null, 0, 0, 0);
private static int UNINITIALISED_SPEED = Integer.MIN_VALUE; private static int UNINITIALISED_SPEED = Integer.MIN_VALUE;
} }