[Bleeding] Update Tell and Help aliases to use alias system.

2 files changed, 5 insertions, 11 deletions

diff --git a/src/main/java/org/bukkit/command/defaults/HelpCommand.java b/src/main/java/org/bukkit/command/defaults/HelpCommand.java
index db3d92d0..ff73b26f 100644
--- a/src/main/java/org/bukkit/command/defaults/HelpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/HelpCommand.java
@@ -1,6 +1,7 @@
 package org.bukkit.command.defaults;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +29,7 @@ public class HelpCommand extends VanillaCommand {
         super("help");
         this.description = "Shows the help menu";
         this.usageMessage = "/help <pageNumber>\n/help <topic>\n/help <topic> <pageNumber>";
+        this.setAliases(Arrays.asList(new String[] { "?" }));
         this.setPermission("bukkit.command.help");
     }
 
@@ -110,11 +112,6 @@ public class HelpCommand extends VanillaCommand {
     }
 
     @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("help") || input.equalsIgnoreCase("?");
-    }
-
-    @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
         Validate.notNull(sender, "Sender cannot be null");
         Validate.notNull(args, "Arguments cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/TellCommand.java b/src/main/java/org/bukkit/command/defaults/TellCommand.java
index d0aa102e..287f49f8 100644
--- a/src/main/java/org/bukkit/command/defaults/TellCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TellCommand.java
@@ -1,9 +1,10 @@
 package org.bukkit.command.defaults;
 
+import java.util.Arrays;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 
 public class TellCommand extends VanillaCommand {
@@ -11,6 +12,7 @@ public class TellCommand extends VanillaCommand {
         super("tell");
         this.description = "Sends a private message to the given player";
         this.usageMessage = "/tell <player> <message>";
+        this.setAliases(Arrays.asList(new String[] { "w", "msg" }));
         this.setPermission("bukkit.command.tell");
     }
 
@@ -43,9 +45,4 @@ public class TellCommand extends VanillaCommand {
 
         return true;
     }
-
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("tell") || input.equalsIgnoreCase("w") || input.equalsIgnoreCase("msg");
-    }
 }