From 256070fc5957b8f36e83d2816986c4116287fd1e Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Mon, 10 Feb 2014 16:18:36 -0600 Subject: 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. --- .../java/org/bukkit/command/FormattedCommandAlias.java | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java index 40de5e2f..3f07d7f4 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -23,24 +23,6 @@ public class FormattedCommandAlias extends Command { ArrayList commands = new ArrayList(); for (String formatString : formatStrings) { try { - if (sender instanceof Player) { - PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent((Player) sender, "/" + formatString); - Bukkit.getPluginManager().callEvent(event); - if (event.isCancelled()) { - return false; - } else { - formatString = event.getMessage().substring(1); - } - } else if (sender instanceof RemoteConsoleCommandSender) { - RemoteServerCommandEvent event = new RemoteServerCommandEvent(sender, formatString); - Bukkit.getPluginManager().callEvent(event); - formatString = event.getCommand(); - } else if (sender instanceof ConsoleCommandSender) { - ServerCommandEvent event = new ServerCommandEvent(sender, formatString); - Bukkit.getPluginManager().callEvent(event); - formatString = event.getCommand(); - } - commands.add(buildCommand(formatString, args)); } catch (Throwable throwable) { if (throwable instanceof IllegalArgumentException) { -- cgit v1.2.3