diff options
| author | Jason Penilla <[email protected]> | 2024-05-22 11:30:12 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2024-05-22 11:30:12 -0700 |
| commit | f1e023b259b871441edb72a24f1542b12981af4a (patch) | |
| tree | eb306f741f82bb0764a202157aaf35df6b722bde | |
| parent | 665c65b39e953ff253cc30cc20b8cc201073a33b (diff) | |
| download | Paper-f1e023b259b871441edb72a24f1542b12981af4a.tar.gz Paper-f1e023b259b871441edb72a24f1542b12981af4a.zip | |
Fix bad rebasebukkit-pluginloader-api
| -rw-r--r-- | patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch index 59da8a4a9f..980c3dc8a0 100644 --- a/patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch +++ b/patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch @@ -4,21 +4,6 @@ Date: Tue, 21 May 2024 13:18:15 -0700 Subject: [PATCH] Allow Bukkit plugin to use Paper PluginLoader API -diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperPluginClassLoader.java b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperPluginClassLoader.java -index 18401ede9cd1fc7094c6b74859929938e01795ca..cc14e569d282ca53ce4237d3a57c764815502ddf 100644 ---- a/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperPluginClassLoader.java -+++ b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperPluginClassLoader.java -@@ -48,6 +48,10 @@ public class PaperPluginClassLoader extends PaperSimplePluginClassLoader impleme - @Nullable - private PluginClassLoaderGroup group; - -+ private PaperPluginMeta configuration() { -+ return (PaperPluginMeta) this.configuration; -+ } -+ - public PaperPluginClassLoader(Logger logger, Path source, JarFile file, PaperPluginMeta configuration, ClassLoader parentLoader, URLClassLoader libraryLoader) throws IOException { - super(source, file, configuration, parentLoader); - this.libraryLoader = libraryLoader; diff --git a/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java b/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java index f9d4b33050a6fe8c2dabe8e5eec075d95dc513e0..dc106685ecb483c33c06e4f83eda27be58251aad 100644 --- a/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java |