diff options
author | t00thpick1 <t00thpick1dirko@gmail.com> | 2014-02-10 12:36:00 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-02-10 17:19:39 -0600 |
commit | cc8bac3616696766d0930d6506c73a6a07c0c8b8 (patch) | |
tree | 13010d2b4bfa72737b06fe3c89164a78f5fb45a7 | |
parent | 256070fc5957b8f36e83d2816986c4116287fd1e (diff) | |
download | bukkit-cc8bac3616696766d0930d6506c73a6a07c0c8b8.tar bukkit-cc8bac3616696766d0930d6506c73a6a07c0c8b8.tar.gz bukkit-cc8bac3616696766d0930d6506c73a6a07c0c8b8.tar.lz bukkit-cc8bac3616696766d0930d6506c73a6a07c0c8b8.tar.xz bukkit-cc8bac3616696766d0930d6506c73a6a07c0c8b8.zip |
[Bleeding] Update Tell and Help aliases to use alias system.
-rw-r--r-- | src/main/java/org/bukkit/command/defaults/HelpCommand.java | 7 | ||||
-rw-r--r-- | src/main/java/org/bukkit/command/defaults/TellCommand.java | 9 |
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"); - } } |