928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
27 lines
1.5 KiB
Diff
27 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
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 60988665eb358d5566e9de61aec841db3f79722c..d1c1df75c011d8b4e10342c864aeb206e5cac23f 100644
|
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
@@ -277,6 +277,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);
|
|
|
|
@@ -310,6 +311,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 {
|