Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Upstream (#1643)

Browse Source 
44863cf Don't access PluginClassLoader directly (#2045)
This commit is contained in:
Pierre Maurice Schwang 2022-03-05 18:19:58 +01:00 committed by GitHub
parent 44078d1820
commit 668227ee6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/ClassSourceValidator.java
View File

@ -25,7 +25,6 @@ import com.sk89q.worldedit.internal.util.LogManagerCompat;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.PluginClassLoader;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -45,14 +44,17 @@ public class ClassSourceValidator {
private static final String SEPARATOR_LINE = Strings.repeat("*", 46); private static final String SEPARATOR_LINE = Strings.repeat("*", 46);
private static final Method loadClass; private static final Method loadClass;
private static Class<?> pluginClassLoaderClass;
static { static {
Method tmp; Method tmp;
try { try {
tmp = PluginClassLoader.class.getDeclaredMethod("loadClass0", pluginClassLoaderClass = Class.forName("org.bukkit.plugin.java.PluginClassLoader", false,
Bukkit.class.getClassLoader());
tmp = pluginClassLoaderClass.getDeclaredMethod("loadClass0",
String.class, boolean.class, boolean.class, boolean.class); String.class, boolean.class, boolean.class, boolean.class);
tmp.setAccessible(true); tmp.setAccessible(true);
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException | ClassNotFoundException e) {
tmp = null; tmp = null;
} }
loadClass = tmp; loadClass = tmp;
@ -96,7 +98,7 @@ public class ClassSourceValidator {
continue; continue;
} }
ClassLoader targetLoader = target.getClass().getClassLoader(); ClassLoader targetLoader = target.getClass().getClassLoader();
if (!(targetLoader instanceof PluginClassLoader)) { if (!(pluginClassLoaderClass.isAssignableFrom(targetLoader.getClass()))) {
continue; continue;
} }
for (Class<?> testClass : classes) { for (Class<?> testClass : classes) {