Skip to content

Commit d45788b

Browse files
t00thpick1amaranth
t00thpick1
authored andcommitted
[Bleeding] Update Tell and Help aliases to use alias system.
1 parent c9581ce commit d45788b

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/main/java/org/bukkit/command/defaults/HelpCommand.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.bukkit.command.defaults;
22

33
import java.util.ArrayList;
4+
import java.util.Arrays;
45
import java.util.HashMap;
56
import java.util.List;
67
import java.util.Map;
@@ -28,6 +29,7 @@ public HelpCommand() {
2829
super("help");
2930
this.description = "Shows the help menu";
3031
this.usageMessage = "/help <pageNumber>\n/help <topic>\n/help <topic> <pageNumber>";
32+
this.setAliases(Arrays.asList(new String[] { "?" }));
3133
this.setPermission("bukkit.command.help");
3234
}
3335

@@ -109,11 +111,6 @@ public boolean execute(CommandSender sender, String currentAlias, String[] args)
109111
return true;
110112
}
111113

112-
@Override
113-
public boolean matches(String input) {
114-
return input.equalsIgnoreCase("help") || input.equalsIgnoreCase("?");
115-
}
116-
117114
@Override
118115
public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
119116
Validate.notNull(sender, "Sender cannot be null");

src/main/java/org/bukkit/command/defaults/TellCommand.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package org.bukkit.command.defaults;
22

3+
import java.util.Arrays;
4+
35
import org.bukkit.Bukkit;
46
import org.bukkit.ChatColor;
57
import org.bukkit.command.CommandSender;
6-
import org.bukkit.command.ConsoleCommandSender;
78
import org.bukkit.entity.Player;
89

910
public class TellCommand extends VanillaCommand {
1011
public TellCommand() {
1112
super("tell");
1213
this.description = "Sends a private message to the given player";
1314
this.usageMessage = "/tell <player> <message>";
15+
this.setAliases(Arrays.asList(new String[] { "w", "msg" }));
1416
this.setPermission("bukkit.command.tell");
1517
}
1618

@@ -43,9 +45,4 @@ public boolean execute(CommandSender sender, String currentAlias, String[] args)
4345

4446
return true;
4547
}
46-
47-
@Override
48-
public boolean matches(String input) {
49-
return input.equalsIgnoreCase("tell") || input.equalsIgnoreCase("w") || input.equalsIgnoreCase("msg");
50-
}
5148
}

0 commit comments

Comments
 (0)