2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Kyle Wood <demonwav@gmail.com>
|
|
|
|
|
Date: Fri, 4 Dec 2020 15:53:19 -0800
|
|
|
|
|
Subject: [PATCH] Enable multi-release plugin jars
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
2021-06-14 18:50:22 +00:00
|
|
|
index 6b5d7c350c216b7a234d96ecacae1d39a1acd814..18cf36020bca7c174a775de75241f149ef4e45e7 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
|
|
|
|
@@ -58,7 +58,18 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
|
|
|
|
|
this.description = description;
|
|
|
|
|
this.dataFolder = dataFolder;
|
|
|
|
|
this.file = file;
|
|
|
|
|
- this.jar = new JarFile(file);
|
|
|
|
|
+ // Paper - enable multi-release jars for Java 9+
|
|
|
|
|
+ JarFile jarFile;
|
|
|
|
|
+ try {
|
|
|
|
|
+ final java.lang.reflect.Method runtimeVersionMethod = JarFile.class.getMethod("runtimeVersion");
|
|
|
|
|
+ final Object runtimeVersion = runtimeVersionMethod.invoke(null);
|
|
|
|
|
+ @SuppressWarnings("JavaReflectionMemberAccess") final java.lang.reflect.Constructor<JarFile> constructor = JarFile.class.getConstructor(File.class, boolean.class, int.class, runtimeVersion.getClass());
|
|
|
|
|
+ jarFile = constructor.newInstance(file, true, java.util.zip.ZipFile.OPEN_READ, runtimeVersion);
|
|
|
|
|
+ } catch (Exception ignored) {
|
|
|
|
|
+ jarFile = new JarFile(file);
|
|
|
|
|
+ }
|
|
|
|
|
+ this.jar = jarFile;
|
|
|
|
|
+ // Paper end
|
|
|
|
|
this.manifest = jar.getManifest();
|
|
|
|
|
this.url = file.toURI().toURL();
|
|
|
|
|
this.libraryLoader = libraryLoader;
|
