From 065b0281f1f1e62f8d96ff4cf8d3cfa813e0227c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 5 Jul 2016 16:48:36 +0100 Subject: [PATCH] Disable already-loaded check during hotswap reload, fixes #136 --- .../org/spongepowered/asm/mixin/transformer/MixinInfo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 4c4a0877..8d4265da 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -738,7 +738,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { private void readTargets(Collection outTargets, Collection inTargets, boolean suppressPlugin, boolean checkPublic) { for (String targetRef : inTargets) { String targetName = targetRef.replace('/', '.'); - if (MixinInfo.classLoaderUtil.isClassLoaded(targetName)) { + if (MixinInfo.classLoaderUtil.isClassLoaded(targetName) && !this.isReloading()) { String message = String.format("Critical problem: %s target %s was already transformed.", this, targetName); if (this.parent.isRequired()) { throw new MixinTargetAlreadyLoadedException(this, message, targetName); @@ -796,6 +796,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { Integer priority = ASMHelper.getAnnotationValue(mixin, "priority"); return priority == null ? this.parent.getDefaultMixinPriority() : priority.intValue(); } + + private boolean isReloading() { + return this.pendingState instanceof Reloaded; + } /** * Current state, either the validated state or the uninitialised state if