From b94bb2766369d01c82c0c8c1918080554ee5b3ab Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Fri, 24 Jun 2011 00:57:46 +0100
Subject: [PATCH] Delayed alias registration until postworld

---
 src/main/java/org/bukkit/craftbukkit/CraftServer.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2c48addcce..019a0b1431 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -126,17 +126,20 @@ public final class CraftServer implements Server {
         } else {
             pluginFolder.mkdir();
         }
-
-        commandMap.registerServerAliases();
     }
 
     public void enablePlugins(PluginLoadOrder type) {
         Plugin[] plugins = pluginManager.getPlugins();
+
         for (Plugin plugin : plugins) {
             if ((!plugin.isEnabled()) && (plugin.getDescription().getLoad() == type)) {
                 loadPlugin(plugin);
             }
         }
+
+        if (type == PluginLoadOrder.POSTWORLD) {
+            commandMap.registerServerAliases();
+        }
     }
 
     public void disablePlugins() {