From cb786ac7a0ba023c25aad6a9291b45c1e6c3c968 Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Wed, 13 Apr 2022 17:05:22 +0200
Subject: [PATCH] Add loaded bungee plugins to toLoad

---
 .../bungee/managers/BungeePluginManager.java         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java b/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java
index 8484a88..10f32de 100644
--- a/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java
+++ b/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java
@@ -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())) {