Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More test fixes

Browse Source
This commit is contained in:
Anuken
2025-10-23 22:50:58 -04:00
parent 977f320122
commit 85f5557270
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/mod/ContentParser.java
+3 -1
View File
@@ -140,7 +140,8 @@ public class ContentParser{
}else if(data.isArray()){ }else if(data.isArray()){
return new MultiBulletType(parser.readValue(BulletType[].class, data)); 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"); data.remove("type");
BulletType result = (BulletType)make(bc); BulletType result = (BulletType)make(bc);
readFields(result, data); readFields(result, data);
@@ -863,6 +864,7 @@ public class ContentParser{
reads.clear(); reads.clear();
postreads.clear(); postreads.clear();
toBeParsed.clear(); toBeParsed.clear();
currentMod = null;
} }
/** /**