mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-06 02:40:23 -08:00
Code Issues 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

4
core/src/mindustry/mod/ContentParser.java
View file

@ -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;
}
/**