From 2ef3dfed7b4f367bfa13d7c01b26a63214a9da1e Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sat, 1 Oct 2011 13:56:17 -0400 Subject: [PATCH] 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. By: EvilSeph --- .../src/main/java/org/bukkit/plugin/SimplePluginManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java index 0ba72b7531..a79c3583b4 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/paper-api/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) {