mirror of
https://github.com/LegacyModdingMC/UniMixins.git
synced 2026-11-21 21:02:13 +00:00
fix NPE in LateMixinOrchestrationMixin + don't mutate original mixins list
This commit is contained in:
1 parent
9e2cd35b5a
commit
4cf9abd071
1 file changed
+8
-3
+8
-3
@@ -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<String> mixins = new ArrayList<>();
|
||||
final Object o = Reflection.mixinClassesField.get(Reflection.configField.get(config));
|
||||
final List<String> mixins;
|
||||
if (o instanceof List) {
|
||||
mixins = (List<String>) o;
|
||||
} else {
|
||||
mixins = new ArrayList<>();
|
||||
Reflection.mixinClassesField.set(Reflection.configField.get(config), mixins);
|
||||
}
|
||||
mixins.addAll(lateLoader.getMixins(loadedMods));
|
||||
mixins.addAll((List<String>) 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);
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user