diff options
| author | FrozenCow <frozencow@gmail.com> | 2011-01-07 02:33:59 +0800 |
|---|---|---|
| committer | Dinner Bone <dinnerbone@dinnerbone.com> | 2011-01-07 17:52:10 +0800 |
| commit | 6a786c1c21308805294040083a0ccf04bf9ebcf9 (patch) | |
| tree | e9d95c570fc9df285713e100f76ef620b2059b95 /src | |
| parent | 687ae0533c74ce990006be2ed9134426cb0d107f (diff) | |
| download | craftbukkit-6a786c1c21308805294040083a0ccf04bf9ebcf9.tar craftbukkit-6a786c1c21308805294040083a0ccf04bf9ebcf9.tar.gz craftbukkit-6a786c1c21308805294040083a0ccf04bf9ebcf9.tar.lz craftbukkit-6a786c1c21308805294040083a0ccf04bf9ebcf9.tar.xz craftbukkit-6a786c1c21308805294040083a0ccf04bf9ebcf9.zip | |
Fixed plugins being loaded before world.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/MinecraftServer.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index c3b2568c..b54a1d4c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -136,6 +136,8 @@ implements ICommandListener, Runnable { private void e() { i = null; j = 0; + + server.loadPlugins(); } private void f() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 4d814ed1..11884e71 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -26,7 +26,9 @@ public final class CraftServer implements Server { this.server = server; pluginManager.RegisterInterface(JavaPluginLoader.class); - + } + + public void loadPlugins() { File pluginFolder = (File)console.options.valueOf("plugins"); if (pluginFolder.exists()) { |