From ce622cdfa6df72b330115bd7d0208bf8bfbc6409 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 24 Nov 2019 14:38:19 +0000 Subject: [PATCH] Move classload tracking to AFTER so PREPARE doesn't fail for first class This bug would trigger when the *first* class to be classloaded had a mixin applied to it, since the class tracker would log the classload before the prepare phase happened. --- .../service/modlauncher/ModLauncherClassTracker.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/ModLauncherClassTracker.java b/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/ModLauncherClassTracker.java index 8280d386..398748ce 100644 --- a/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/ModLauncherClassTracker.java +++ b/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/ModLauncherClassTracker.java @@ -91,11 +91,7 @@ public class ModLauncherClassTracker implements IClassProcessor, IClassTracker { } } - synchronized (this.loadedClasses) { - this.loadedClasses.add(name); - } - - return Phases.NONE; + return Phases.AFTER_ONLY; } /* (non-Javadoc) @@ -106,6 +102,10 @@ public class ModLauncherClassTracker implements IClassProcessor, IClassTracker { */ @Override public boolean processClass(Phase phase, ClassNode classNode, Type classType, String reason) { + synchronized (this.loadedClasses) { + this.loadedClasses.add(classType.getClassName()); + } + return false; }