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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2019-10-17 17:00:49 -04:00
parent a0c93ea7d3 6437e6b878
commit 25cacbb28d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/mod/ContentParser.java
View File

@@ -42,7 +42,7 @@ public class ContentParser{
if(data.isString()){ if(data.isString()){
return field(Bullets.class, data); return field(Bullets.class, data);
} }
Class<? extends BulletType> bc = data.has("type") ? resolve(data.getString("type"), "io.anuke.mindustry.entities.bullets") : BasicBulletType.class; Class<? extends BulletType> bc = data.has("type") ? resolve(data.getString("type"), "io.anuke.mindustry.entities.bullet") : BasicBulletType.class;
data.remove("type"); data.remove("type");
BulletType result = make(bc); BulletType result = make(bc);
readFields(result, data); readFields(result, data);