Lowered the priority of the old command handler event because a number of plugins were using this event incorrectly. A new event, the command preprocesser event, has replaced the previous function of the original command event.

3 files changed, 22 insertions, 3 deletions

diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
index 0beea9c6..6fee5240 100644
--- a/src/main/java/org/bukkit/event/Event.java
+++ b/src/main/java/org/bukkit/event/Event.java
@@ -179,6 +179,13 @@ public abstract class Event {
         PLAYER_COMMAND (Category.PLAYER),
 
         /**
+         * Called when a player early in the command handling process
+         *
+         * @see org.bukkit.event.player.PlayerChatEvent
+         */
+        PLAYER_COMMAND_PREPROCESS (Category.PLAYER),
+
+        /**
          * Called when a player leaves a server
          *
          * @see org.bukkit.event.player.PlayerEvent
diff --git a/src/main/java/org/bukkit/event/player/PlayerListener.java b/src/main/java/org/bukkit/event/player/PlayerListener.java
index e2760acc..4b1d0035 100644
--- a/src/main/java/org/bukkit/event/player/PlayerListener.java
+++ b/src/main/java/org/bukkit/event/player/PlayerListener.java
@@ -43,9 +43,7 @@ public class PlayerListener implements Listener {
     }
 
     /**
-     * Called when a player attempts to use a command. Avoid using this
-     * when possible -- it won't be removed, but this is not how you
-     * handle commands.
+     * Called when a player attempts to use a command.
      *
      * @param event Relevant event details
      */
@@ -54,6 +52,15 @@ public class PlayerListener implements Listener {
     }
 
     /**
+     * Called early in the command handling process. This event is only
+     * for very exceptional cases and you should not normally use it.
+     *
+     * @param event Relevant event details
+     */
+    public void onPlayerCommandPreprocess(PlayerChatEvent event) {
+    }
+
+    /**
      * Called when a player attempts to move location in a world
      *
      * @param event Relevant event details
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index bb9ddf18..6241bda6 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -150,6 +150,11 @@ public final class JavaPluginLoader implements PluginLoader {
                     ((PlayerListener)listener).onPlayerCommand( (PlayerChatEvent)event );
                 }
             };
+        case PLAYER_COMMAND_PREPROCESS:
+            return new EventExecutor() { public void execute( Listener listener, Event event ) {
+                    ((PlayerListener)listener).onPlayerCommandPreprocess( (PlayerChatEvent)event );
+                }
+            };
         case PLAYER_CHAT:
             return new EventExecutor() { public void execute( Listener listener, Event event ) {
                     ((PlayerListener)listener).onPlayerChat( (PlayerChatEvent)event );