13
0
geforkt von Mirrors/Paper

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 <evilseph@gmail.com>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2011-10-01 13:56:17 -04:00
Ursprung 367dbc663e
Commit 2ef3dfed7b

Datei anzeigen

@ -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) {