From 65b4f9d55a1eb9f5c5491e8a1cfcee3ba9b8fb0e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 24 Jun 2021 20:22:28 +0100 Subject: [PATCH] Pass the correct (mutable) targets set to plugins, fixes #485 --- .../spongepowered/asm/mixin/transformer/MixinConfig.java | 8 ++++++++ .../asm/mixin/transformer/MixinProcessor.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index b15e1ef1..204b46e6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -1012,6 +1012,14 @@ final class MixinConfig implements Comparable, IMixinConfig { public IMixinConfigPlugin getPlugin() { return this.plugin.get(); } + + /** + * Returns a mutable view of the targets set, used to pass the targets to + * config plugins + */ + public Set getTargetsSet() { + return this.mixinMapping.keySet(); + } /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinConfig#getTargets() diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java index 977782fe..8dc8fea7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java @@ -538,7 +538,7 @@ class MixinProcessor { } } - plugin.acceptTargets(config.getTargets(), Collections.unmodifiableSet(otherTargets)); + plugin.acceptTargets(config.getTargetsSet(), Collections.unmodifiableSet(otherTargets)); } for (MixinConfig config : this.pendingConfigs) {