Skip to content

Commit

Permalink
Update for core's simplified class loading (#2382)
Browse files Browse the repository at this point in the history
  • Loading branch information
Morphan1 committed Oct 2, 2022
1 parent d94b494 commit 4cec330
Showing 1 changed file with 0 additions and 33 deletions.
Expand Up @@ -361,39 +361,6 @@ else if (def.equals("__npc")) {
return false;
}

public static boolean isPluginLoader, hasProcessedLoader;
public static Map<String, Class<?>> classMap;

public static void initClassLoaderRef() {
if (hasProcessedLoader) {
return;
}
hasProcessedLoader = true;
try {
ClassLoader loader = DenizenCoreImplementation.class.getClassLoader();
Class<?> pluginClassLoaderClass = Class.forName("org.bukkit.plugin.java.PluginClassLoader");
isPluginLoader = pluginClassLoaderClass.isAssignableFrom(loader.getClass());
if (isPluginLoader) {
classMap = ReflectionHelper.getFieldValue(pluginClassLoaderClass, "classes", loader);
}
}
catch (Throwable ex) {
Debug.echoError(ex);
}
}

@Override
public void saveClassToLoader(Class<?> clazz) {
initClassLoaderRef();
if (!isPluginLoader) {
return;
}
if (classMap.containsKey(clazz.getName())) {
Debug.echoError("Class " + clazz.getName() + " already defined?");
}
classMap.put(clazz.getName(), clazz);
}

@Override
public void addExtraErrorHeaders(StringBuilder headerBuilder, ScriptEntry source) {
BukkitScriptEntryData data = Utilities.getEntryData(source);
Expand Down

0 comments on commit 4cec330

Please sign in to comment.