Commits

Travis Watkins authored 256070fc595 
Remove extra events from alias execution.

When executing an alias we already call an event for the alias itself. The
extra events are not needed for logging purposes as the alias itself is
logged and the events cause issues for plugins trying to do spam checking
on their own.
No tags
45d2e3ff200
master

src/main/java/org/bukkit/command/FormattedCommandAlias.java

Modified
16 16 super(alias);
17 17 this.formatStrings = formatStrings;
18 18 }
19 19 ​
20 20 @Override
21 21 public boolean execute(CommandSender sender, String commandLabel, String[] args) {
22 22 boolean result = false;
23 23 ArrayList<String> commands = new ArrayList<String>();
24 24 for (String formatString : formatStrings) {
25 25 try {
26 - if (sender instanceof Player) {
27 - PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent((Player) sender, "/" + formatString);
28 - Bukkit.getPluginManager().callEvent(event);
29 - if (event.isCancelled()) {
30 - return false;
31 - } else {
32 - formatString = event.getMessage().substring(1);
33 - }
34 - } else if (sender instanceof RemoteConsoleCommandSender) {
35 - RemoteServerCommandEvent event = new RemoteServerCommandEvent(sender, formatString);
36 - Bukkit.getPluginManager().callEvent(event);
37 - formatString = event.getCommand();
38 - } else if (sender instanceof ConsoleCommandSender) {
39 - ServerCommandEvent event = new ServerCommandEvent(sender, formatString);
40 - Bukkit.getPluginManager().callEvent(event);
41 - formatString = event.getCommand();
42 - }
43 -​
44 26 commands.add(buildCommand(formatString, args));
45 27 } catch (Throwable throwable) {
46 28 if (throwable instanceof IllegalArgumentException) {
47 29 sender.sendMessage(throwable.getMessage());
48 30 } else {
49 31 sender.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command");
50 32 }
51 33 return false;
52 34 }
53 35 }

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut