From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Fri, 1 Oct 2021 09:47:00 +0200 Subject: [PATCH] Fix plugin provides load order Fixes https://hub.spigotmc.org/jira/browse/SPIGOT-6740 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java index 35aa6dff52944019510f16180e36da0088654432..34c3df7570479d4f045897fe4e26dfa3f27479c4 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -276,6 +276,7 @@ public final class SimplePluginManager implements PluginManager { // Paper end missingDependency = false; pluginIterator.remove(); + pluginsProvided.values().removeIf(s -> s.equals(plugin)); // Paper - remove provided plugins softDependencies.remove(plugin); dependencies.remove(plugin); @@ -309,6 +310,7 @@ public final class SimplePluginManager implements PluginManager { // We're clear to load, no more soft or hard dependencies left File file = plugins.get(plugin); pluginIterator.remove(); + pluginsProvided.values().removeIf(s -> s.equals(plugin)); // Paper - remove provided plugins missingDependency = false; try {