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

Cancel navigation on despawn: Navigation isn't carried over so CitizensNavigator would be left in an inconsistent state

Browse Source
This commit is contained in:
fullwall 2013-03-14 23:29:41 +08:00
parent 5f093276f1
commit aa022f8fae
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,8 +103,11 @@ public class CitizensNavigator implements Navigator, Runnable {
public void run() { public void run() {
if (!isNavigating()) if (!isNavigating())
return; return;
if (!npc.isSpawned()) if (!npc.isSpawned()) {
if (isNavigating())
stopNavigating(CancelReason.NPC_DESPAWNED);
return; return;
}
if (updateStationaryStatus()) if (updateStationaryStatus())
return; return;
updatePathfindingRange(); updatePathfindingRange();

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

@ -44,7 +44,7 @@ public class WanderWaypointProvider implements WaypointProvider {
@Override @Override
public void onSpawn(NPC npc) { public void onSpawn(NPC npc) {
if (currentGoal == null) { if (currentGoal == null) {
currentGoal = WanderGoal.createWithNPC(npc); currentGoal = WanderGoal.createWithNPCAndRange(npc, xrange, yrange);
CitizensAPI.registerEvents(currentGoal); CitizensAPI.registerEvents(currentGoal);
} }
npc.getDefaultGoalController().addGoal(currentGoal, 1); npc.getDefaultGoalController().addGoal(currentGoal, 1);