aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0327-Fix-plugin-provides-load-order.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2022-03-04 00:09:43 -0800
committerGitHub <[email protected]>2022-03-04 09:09:43 +0100
commit15b6b3db2cf24c98afbfb0849e694875d18fc021 (patch)
tree03e884d0c7fe2ce292825b5b51ec4c9a6ce2e8cc /patches/api/0327-Fix-plugin-provides-load-order.patch
parent753bf2c1034c5f35cc0839001d12363a44f936fc (diff)
downloadPaper-15b6b3db2cf24c98afbfb0849e694875d18fc021.tar.gz
Paper-15b6b3db2cf24c98afbfb0849e694875d18fc021.zip
Add StructuresLocateEvent as replacement for StructureLocateEvent (#7524)
Diffstat (limited to 'patches/api/0327-Fix-plugin-provides-load-order.patch')
-rw-r--r--patches/api/0327-Fix-plugin-provides-load-order.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/patches/api/0327-Fix-plugin-provides-load-order.patch b/patches/api/0327-Fix-plugin-provides-load-order.patch
deleted file mode 100644
index 83c8568dff..0000000000
--- a/patches/api/0327-Fix-plugin-provides-load-order.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <[email protected]>
-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 c57a59d337a41c083e88e36637d839db027b9289..1366496271c4c7f72d1e5f990e51775b1c371f99 100644
---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -281,6 +281,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);
-
-@@ -314,6 +315,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 {