From 4cf9abd07124b98e6d0f0e499ea028a66d122cb3 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sat, 12 Jul 2025 19:33:36 +0200 Subject: [PATCH] fix NPE in LateMixinOrchestrationMixin + don't mutate original mixins list --- .../mixins/LateMixinOrchestrationMixin.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java index f246860..047b404 100644 --- a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java +++ b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java @@ -66,13 +66,18 @@ public class LateMixinOrchestrationMixin { GTNHMixins.log("Loading mixins from ILateMixinLoader [{}]", lateLoader.getClass().getName()); final String mixinConfig = lateLoader.getMixinConfig(); final Config config = Config.create(mixinConfig, null); - final List mixins = new ArrayList<>(); + final Object o = Reflection.mixinClassesField.get(Reflection.configField.get(config)); + final List mixins; + if (o instanceof List) { + mixins = (List) o; + } else { + mixins = new ArrayList<>(); + Reflection.mixinClassesField.set(Reflection.configField.get(config), mixins); + } mixins.addAll(lateLoader.getMixins(loadedMods)); - mixins.addAll((List) Reflection.mixinClassesField.get(Reflection.configField.get(config))); for (String mixin : mixins) { GTNHMixins.log("Loading [{}] {}", mixinConfig, mixin); } - Reflection.mixinClassesField.set(Reflection.configField.get(config), mixins); Reflection.registerConfigurationMethod.invoke(null, config); }