diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/io/anuke/mindustry/mod/ContentParser.java index 9d1563b585..616a6ad7b6 100644 --- a/core/src/io/anuke/mindustry/mod/ContentParser.java +++ b/core/src/io/anuke/mindustry/mod/ContentParser.java @@ -51,6 +51,11 @@ public class ContentParser{ } } }); + put(StatusEffect.class, (type, data) -> { + StatusEffect effect = new StatusEffect(); + readFields(effect, data); + return effect; + }); put(Color.class, (type, data) -> Color.valueOf(data.asString())); put(BulletType.class, (type, data) -> { if(data.isString()){ diff --git a/core/src/io/anuke/mindustry/mod/Mods.java b/core/src/io/anuke/mindustry/mod/Mods.java index 33e567148c..bf7753eea0 100644 --- a/core/src/io/anuke/mindustry/mod/Mods.java +++ b/core/src/io/anuke/mindustry/mod/Mods.java @@ -385,7 +385,7 @@ public class Mods implements Loadable{ try{ for(LoadedMod mod : loaded){ if(mod.root.child("scripts").exists()){ - content.setCurrentMod(mod.name); + content.setCurrentMod(mod); mod.scripts = mod.root.child("scripts").findAll(f -> f.extension().equals("js")); Log.info("[{0}] Found {1} scripts.", mod.meta.name, mod.scripts.size);