From 6a786c1c21308805294040083a0ccf04bf9ebcf9 Mon Sep 17 00:00:00 2001 From: FrozenCow Date: Fri, 7 Jan 2011 02:33:59 +0800 Subject: Fixed plugins being loaded before world. --- src/main/java/net/minecraft/server/MinecraftServer.java | 2 ++ src/main/java/org/bukkit/craftbukkit/CraftServer.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') 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()) { -- cgit v1.2.3