diff options
| author | EvilSeph <evilseph@gmail.com> | 2011-10-01 13:56:17 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2011-10-01 13:56:17 -0400 |
| commit | 0f885de3ba66d5f60689bae185da25f661c41fa2 (patch) | |
| tree | a7796d1ab744987763476656415568f2b02a83ec /src/main | |
| parent | 76b85c61ae1ae4b906cf00312ab0c8a428a24b28 (diff) | |
| download | bukkit-0f885de3ba66d5f60689bae185da25f661c41fa2.tar bukkit-0f885de3ba66d5f60689bae185da25f661c41fa2.tar.gz bukkit-0f885de3ba66d5f60689bae185da25f661c41fa2.tar.lz bukkit-0f885de3ba66d5f60689bae185da25f661c41fa2.tar.xz bukkit-0f885de3ba66d5f60689bae185da25f661c41fa2.zip | |
Moved itr.remove() in loadPlugins(). Thanks lahwran!
This was moved so that the loop does not end until it has gone through a
whole pass without finding any loadable plugins.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/bukkit/plugin/SimplePluginManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java index 0ba72b75..a79c3583 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -134,7 +134,6 @@ public final class SimplePluginManager implements PluginManager { try { plugin = loadPlugin(file, finalPass); - itr.remove(); } catch (UnknownDependencyException ex) { if (finalPass) { server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': " + ex.getMessage(), ex); @@ -154,6 +153,7 @@ public final class SimplePluginManager implements PluginManager { result.add(plugin); allFailed = false; finalPass = false; + itr.remove(); } } if (finalPass) { @@ -275,7 +275,7 @@ public final class SimplePluginManager implements PluginManager { if (!pluginCommands.isEmpty()) { commandMap.registerAll(plugin.getDescription().getName(), pluginCommands); } - + try { plugin.getPluginLoader().enablePlugin(plugin); } catch (Throwable ex) { |