Remove waypoint provider goal when providers change

CitizensDev · Oct 20, 2013 · a7a6b54 · a7a6b54
1 parent 01c7338
commit a7a6b54
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
@@ -138,6 +138,11 @@ public void load(DataKey key) {
         rebuildTree();
     }
 
+    @Override
+    public void onRemove() {
+        npc.getDefaultGoalController().removeGoal(currentGoal);
+    }
+
     @Override
     public void onSpawn(NPC npc) {
         this.npc = npc;

diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -86,6 +86,11 @@ public void load(DataKey key) {
         }
     }
 
+    @Override
+    public void onRemove() {
+        npc.getDefaultGoalController().removeGoal(currentGoal);
+    }
+
     @Override
     public void onSpawn(NPC npc) {
         this.npc = npc;

diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
@@ -12,6 +12,7 @@
 
 public class WanderWaypointProvider implements WaypointProvider {
     private Goal currentGoal;
+    private NPC npc;
     private volatile boolean paused;
     @Persist
     private final int xrange = DEFAULT_XRANGE;
@@ -42,8 +43,14 @@ public boolean isPaused() {
     public void load(DataKey key) {
     }
 
+    @Override
+    public void onRemove() {
+        npc.getDefaultGoalController().removeGoal(currentGoal);
+    }
+
     @Override
     public void onSpawn(NPC npc) {
+        this.npc = npc;
         if (currentGoal == null) {
             currentGoal = WanderGoal.createWithNPCAndRange(npc, xrange, yrange);
             CitizensAPI.registerEvents(currentGoal);
@@ -61,5 +68,6 @@ public void setPaused(boolean paused) {
     }
 
     private static final int DEFAULT_XRANGE = 3;
+
     private static final int DEFAULT_YRANGE = 25;
 }
diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java
@@ -33,6 +33,11 @@ public interface WaypointProvider {
      */
     public void load(DataKey key);
 
+    /**
+     * Called when the provider is removed from the NPC.
+     */
+    public void onRemove();
+
     /**
      * Called when the {@link NPC} attached to this provider is spawned.
      * 

diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
@@ -81,8 +81,9 @@ public void load(DataKey key) throws NPCLoadException {
 
     @Override
     public void onSpawn() {
-        if (provider != null)
+        if (provider != null) {
             provider.onSpawn(getNPC());
+        }
     }
 
     @Override
@@ -105,14 +106,15 @@ public void save(DataKey key) {
     public boolean setWaypointProvider(String name) {
         name = name.toLowerCase();
         Class<? extends WaypointProvider> clazz = providers.get(name);
-        if (clazz == null)
-            return false;
-        provider = create(clazz);
-        if (provider == null)
+        if (provider != null) {
+            provider.onRemove();
+        }
+        if (clazz == null || (provider = create(clazz)) == null)
             return false;
         providerName = name;
-        if (npc != null && npc.isSpawned())
+        if (npc != null && npc.isSpawned()) {
             provider.onSpawn(npc);
+        }
         return true;
     }