Also make guided waypoints reset when chagned

CitizensDev · Feb 20, 2022 · 65c7e7c · 65c7e7c
1 parent b56a1f8
commit 65c7e7c
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
@@ -243,6 +243,9 @@ private void rebuildTree() {
             tree.put(new long[] { waypoint.getLocation().getBlockX(), waypoint.getLocation().getBlockY(),
                     waypoint.getLocation().getBlockZ() }, waypoint);
         }
+        if (currentGoal != null) {
+            currentGoal.onProviderChanged();
+        }
     }
 
     @Override
@@ -262,6 +265,9 @@ public void save(DataKey key) {
     @Override
     public void setPaused(boolean paused) {
         this.paused = paused;
+        if (currentGoal != null) {
+            currentGoal.onProviderChanged();
+        }
     }
 
     /**
@@ -275,6 +281,15 @@ public Iterable<Waypoint> waypoints() {
     private class GuidedAIGoal implements Goal {
         private GuidedPlan plan;
 
+        public void onProviderChanged() {
+            if (plan != null) {
+                reset();
+                if (npc.getNavigator().isNavigating()) {
+                    npc.getNavigator().cancelNavigation();
+                }
+            }
+        }
+
         @Override
         public void reset() {
             plan = null;