Use Persistable in WaypointProvider

src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java

@@ -2,12 +2,11 @@ package net.citizensnpcs.trait.waypoint;
 
 import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.persistence.Persistable;
 
 import org.bukkit.entity.Player;
 
-public interface WaypointProvider {
+public interface WaypointProvider extends Persistable {
-
     /**
      * Creates an {@link WaypointEditor} with the given {@link Player}.
      *
@@ -25,14 +24,6 @@ public interface WaypointProvider {
      */
     public boolean isPaused();
 
-    /**
-     * Loads from the specified {@link DataKey}.
-     * 
-     * @param key
-     *            The key to load from
-     */
-    public void load(DataKey key);
-
     /**
      * Called when the provider is removed from the NPC.
      */
@@ -46,14 +37,6 @@ public interface WaypointProvider {
      */
     public void onSpawn(NPC npc);
 
-    /**
-     * Saves to the specified {@link DataKey}.
-     * 
-     * @param key
-     *            The key to save to
-     */
-    public void save(DataKey key);
-
     /**
      * Pauses waypoint execution.
      *

src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java

@@ -76,7 +76,6 @@ public class Waypoints extends Trait {
         if (provider == null)
             return;
         PersistenceLoader.load(provider, key.getRelative(providerName));
-        provider.load(key.getRelative(providerName));
     }
 
     @Override
@@ -91,7 +90,6 @@ public class Waypoints extends Trait {
         if (provider == null)
             return;
         PersistenceLoader.save(provider, key.getRelative(providerName));
-        provider.save(key.getRelative(providerName));
         key.setString("provider", providerName);
     }