From 72b3bdf6765bb703d4481b65e12d056d43abc9e0 Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 1 May 2021 08:32:51 +1000 Subject: [PATCH] #3077: Fix regression preventing child classloaders delegating to a PluginClassloader Bug was introduced in 425dd4510989834c52d21d38e239ba0c7a4b02d2 --- .../net/md_5/bungee/api/plugin/PluginClassloader.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginClassloader.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginClassloader.java index aa388823..75cf6e33 100644 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginClassloader.java +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginClassloader.java @@ -54,16 +54,16 @@ final class PluginClassloader extends URLClassLoader } @Override - public Class loadClass(String name) throws ClassNotFoundException + protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { - return loadClass0( name, true, true ); + return loadClass0( name, resolve, true, true ); } - private Class loadClass0(String name, boolean checkOther, boolean checkLibraries) throws ClassNotFoundException + private Class loadClass0(String name, boolean resolve, boolean checkOther, boolean checkLibraries) throws ClassNotFoundException { try { - return super.loadClass( name ); + return super.loadClass( name, resolve ); } catch ( ClassNotFoundException ex ) { } @@ -86,7 +86,7 @@ final class PluginClassloader extends URLClassLoader { try { - return loader.loadClass0( name, false, proxy.getPluginManager().isTransitiveDepend( desc, loader.desc ) ); + return loader.loadClass0( name, resolve, false, proxy.getPluginManager().isTransitiveDepend( desc, loader.desc ) ); } catch ( ClassNotFoundException ex ) { }