Fix the plugin classloader not checking to see if a class was already…

… loaded.
QuiltMC · Sep 7, 2024 · 18658ab · 18658ab
1 parent 8931e70
commit 18658ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ group = org.quiltmc
 description = The mod loading component of Quilt
 url = https://github.com/quiltmc/quilt-loader
 # Don't forget to change this in QuiltLoaderImpl as well
-quilt_loader = 0.26.4-beta.6
+quilt_loader = 0.26.4-beta.7
 
 # Fabric & Quilt Libraries
 asm = 9.6

diff --git a/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java b/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java
@@ -132,7 +132,7 @@ public final class QuiltLoaderImpl {
 
 	public static final int ASM_VERSION = Opcodes.ASM9;
 
-	public static final String VERSION = "0.26.4-beta.6";
+	public static final String VERSION = "0.26.4-beta.7";
 	public static final String MOD_ID = "quilt_loader";
 	public static final String DEFAULT_MODS_DIR = "mods";
 	public static final String DEFAULT_CACHE_DIR = ".cache";

diff --git a/src/main/java/org/quiltmc/loader/impl/plugin/QuiltPluginClassLoader.java b/src/main/java/org/quiltmc/loader/impl/plugin/QuiltPluginClassLoader.java
@@ -48,7 +48,11 @@ public QuiltPluginClassLoader(QuiltPluginContextImpl context, ClassLoader parent
 
 	@Override
 	protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-		Class<?> c = loadClassInner(name);
+		Class<?> c = findLoadedClass(name);
+		if (c != null) {
+			return c;
+		}
+		c = loadClassInner(name);
 		if (c == null) {
 			return super.loadClass(name, resolve);
 		}