From 85f5557270e7223b70188a61d6e7e44d825e885d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 23 Oct 2025 22:50:58 -0400 Subject: [PATCH] More test fixes --- core/src/mindustry/mod/ContentParser.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 954947e174..7e5424b994 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -140,7 +140,8 @@ public class ContentParser{ }else if(data.isArray()){ return new MultiBulletType(parser.readValue(BulletType[].class, data)); } - Class bc = resolve(data.getString("type", ""), resolve(Strings.capitalize(data.getString("type", "")) + "BulletType", BasicBulletType.class), false); + Class alternate = resolve(Strings.capitalize(data.getString("type", "basic")) + "BulletType", Object.class, false); + Class bc = alternate == Object.class ? resolve(data.getString("type", ""), BasicBulletType.class) : alternate; data.remove("type"); BulletType result = (BulletType)make(bc); readFields(result, data); @@ -863,6 +864,7 @@ public class ContentParser{ reads.clear(); postreads.clear(); toBeParsed.clear(); + currentMod = null; } /**