Add loaded bungee plugins to toLoad

This commit is contained in:
Frank van der Heijden 2022-04-13 17:05:22 +02:00
parent cc1fe5568d
commit cb786ac7a0
No known key found for this signature in database
GPG key ID: B808721C2DD5B5B8

View file

@ -77,6 +77,13 @@ public class BungeePluginManager extends AbstractPluginManager<Plugin, BungeePlu
Map<String, PluginDescription> toLoad = RPluginManager.getToLoad(proxyPluginManager);
if (toLoad == null) toLoad = new HashMap<>(descriptions.size());
Map<PluginDescription, Boolean> pluginStatuses = new HashMap<>();
for (Plugin plugin : getPlugins()) {
PluginDescription desc = plugin.getDescription();
pluginStatuses.put(desc, true);
toLoad.put(desc.getName(), desc);
}
for (BungeePluginDescription description : descriptions) {
PluginDescription desc = description.getDescription();
toLoad.put(desc.getName(), desc);
@ -84,11 +91,6 @@ public class BungeePluginManager extends AbstractPluginManager<Plugin, BungeePlu
RPluginManager.setToLoad(proxyPluginManager, toLoad);
Map<PluginDescription, Boolean> pluginStatuses = new HashMap<>();
for (Plugin plugin : getPlugins()) {
pluginStatuses.put(plugin.getDescription(), true);
}
for (Map.Entry<String, PluginDescription> entry : toLoad.entrySet()) {
// Yeah... loadPlugins() calls enablePlugin()
if (!RPluginManager.enablePlugin(proxyPluginManager, pluginStatuses, new Stack<>(), entry.getValue())) {