From 0f885de3ba66d5f60689bae185da25f661c41fa2 Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@gmail.com>
Date: Sat, 1 Oct 2011 13:56:17 -0400
Subject: 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.
---
 src/main/java/org/bukkit/plugin/SimplePluginManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main')

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) {
-- 
cgit v1.2.3