summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-06-24 00:57:46 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-06-24 00:57:46 +0100
commitb94bb2766369d01c82c0c8c1918080554ee5b3ab (patch)
tree8ab74b415b7b7b38505adc9af4052919206d5559 /src/main
parent22c28e593e797b1761920967689f37e74cc6a14a (diff)
downloadcraftbukkit-b94bb2766369d01c82c0c8c1918080554ee5b3ab.tar
craftbukkit-b94bb2766369d01c82c0c8c1918080554ee5b3ab.tar.gz
craftbukkit-b94bb2766369d01c82c0c8c1918080554ee5b3ab.tar.lz
craftbukkit-b94bb2766369d01c82c0c8c1918080554ee5b3ab.tar.xz
craftbukkit-b94bb2766369d01c82c0c8c1918080554ee5b3ab.zip
Delayed alias registration until postworld
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java7
1 files 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 2c48addc..019a0b14 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() {