1 files changed, 21 insertions, 5 deletions
diff --git a/src/main/java/net/benjidial/nswp/commands/DeleteWaypoint.java b/src/main/java/net/benjidial/nswp/commands/DeleteWaypoint.java
index d24d133..785d31f 100644
--- a/src/main/java/net/benjidial/nswp/commands/DeleteWaypoint.java
+++ b/src/main/java/net/benjidial/nswp/commands/DeleteWaypoint.java
@@ -1,20 +1,36 @@
 package net.benjidial.nswp.commands;
 
 import net.benjidial.nswp.Database;
+import net.benjidial.nswp.Waypoint;
 
 import org.bukkit.entity.Player;
 
 import java.sql.SQLException;
+import java.util.List;
 
-public class DeleteWaypoint extends WaypointCommand {
-  public CompletionType getCompletionType() {
-    return CompletionType.Waypoint;
+public class DeleteWaypoint extends PlayerCommand {
+
+  public List<String> getTabCompletions(Player sender, String[] args) throws SQLException {
+    return searchWaypointsByArg(sender, args, 0);
   }
 
-  public boolean body(Player player, String[] args) throws SQLException {
+  public boolean doCommand(Player sender, String[] args) throws SQLException {
+
     if (args.length != 1)
       return false;
-    Database.deleteWaypoint(player, args[0]);
+
+    Database.createWaypointTable(sender);
+
+    Waypoint wp = Database.lookupWaypoint(sender, args[0]);
+    if (wp != null) {
+      Database.deleteWaypoint(sender, args[0]);
+      sender.sendMessage("Deleted " + wp.toString() + ".");
+    }
+    else
+      sender.sendMessage("You do not have a waypoint " + args[0] + ".");
+
     return true;
+
   }
+
 }