diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/server/0013-Paper-Plugins.patch index f3d1374d6e5..c78e85ea55a 100644 --- a/patches/server/0013-Paper-Plugins.patch +++ b/patches/server/0013-Paper-Plugins.patch @@ -2165,7 +2165,7 @@ index 0000000000000000000000000000000000000000..a9bca905eba67972e4d1b07b1d243272 +} diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/strategy/LegacyPluginLoadingStrategy.java b/src/main/java/io/papermc/paper/plugin/entrypoint/strategy/LegacyPluginLoadingStrategy.java new file mode 100644 -index 0000000000000000000000000000000000000000..779f6980a71db8df68c9cf20784976409d13929e +index 0000000000000000000000000000000000000000..2f4d0e04676d000afacd7e5354551e77922b2dcf --- /dev/null +++ b/src/main/java/io/papermc/paper/plugin/entrypoint/strategy/LegacyPluginLoadingStrategy.java @@ -0,0 +1,269 @@ @@ -2283,7 +2283,7 @@ index 0000000000000000000000000000000000000000..779f6980a71db8df68c9cf2078497640 + } + } + -+ Collection loadBeforeSet = provider.getMeta().getPluginSoftDependencies(); ++ Collection loadBeforeSet = provider.getMeta().getLoadBeforePlugins(); + if (loadBeforeSet != null && !loadBeforeSet.isEmpty()) { + for (String loadBeforeTarget : loadBeforeSet) { + if (softDependencies.containsKey(loadBeforeTarget)) { @@ -5857,7 +5857,7 @@ index 0000000000000000000000000000000000000000..b2a6544e321fa61c58bdf5684231de10 +} diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProvider.java b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProvider.java new file mode 100644 -index 0000000000000000000000000000000000000000..36f8dc31394333bb9aaa9341014037a4c5083683 +index 0000000000000000000000000000000000000000..d5db789074ca5a9e005c26a221ee3879252b3d6c --- /dev/null +++ b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProvider.java @@ -0,0 +1,190 @@