From 90b248f321b4382da8ee991d3fcf6c5641f04373 Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Wed, 4 Aug 2021 15:55:47 +0200
Subject: [PATCH] Call JavaPlugin#onLoad only after all ClassLoader's are
 created (bukkit)

---
 .../bukkit/managers/BukkitPluginManager.java       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
index b851912..55ddea6 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
@@ -58,6 +58,7 @@ public class BukkitPluginManager extends AbstractPluginManager<Plugin, BukkitPlu
     public PluginResults<Plugin> loadPluginDescriptions(List<BukkitPluginDescription> descriptions) {
         PluginResults<Plugin> pluginResults = new PluginResults<>();
 
+        List<Plugin> plugins = new ArrayList<>();
         for (BukkitPluginDescription description : descriptions) {
             String pluginId = description.getId();
 
@@ -82,8 +83,19 @@ public class BukkitPluginManager extends AbstractPluginManager<Plugin, BukkitPlu
             }
 
             if (plugin == null) return pluginResults.addResult(pluginId, Result.INVALID_PLUGIN);
+            plugins.add(plugin);
             Bukkit.getPluginManager().callEvent(new BukkitPluginLoadEvent(plugin, PluginEvent.Stage.PRE));
-            plugin.onLoad();
+        }
+
+        for (Plugin plugin : plugins) {
+            String pluginId = getPluginId(plugin);
+            try {
+                plugin.onLoad();
+            } catch (Throwable th) {
+                th.printStackTrace();
+                return pluginResults.addResult(pluginId, Result.ERROR);
+            }
+
             Bukkit.getPluginManager().callEvent(new BukkitPluginLoadEvent(plugin, PluginEvent.Stage.POST));
             pluginResults.addResult(pluginId, plugin);
         }