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

Support for JSON planets without a parent

Browse Source
This commit is contained in:
Anuken
2023-09-05 09:41:04 -04:00
parent fb3fff40d2
commit 7fa002c626
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -268,6 +268,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
kill(); kill();
} }
} }
case shield -> shield = Math.max((float)value, 0f);
case x -> x = World.unconv((float)value); case x -> x = World.unconv((float)value);
case y -> y = World.unconv((float)value); case y -> y = World.unconv((float)value);
case rotation -> rotation = (float)value; case rotation -> rotation = (float)value;

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

@@ -596,7 +596,7 @@ public class ContentParser{
ContentType.planet, (TypeParser<Planet>)(mod, name, value) -> { ContentType.planet, (TypeParser<Planet>)(mod, name, value) -> {
if(value.isString()) return locate(ContentType.planet, name); if(value.isString()) return locate(ContentType.planet, name);
Planet parent = locate(ContentType.planet, value.getString("parent")); Planet parent = locate(ContentType.planet, value.getString("parent", ""));
Planet planet = new Planet(mod + "-" + name, parent, value.getFloat("radius", 1f), value.getInt("sectorSize", 0)); Planet planet = new Planet(mod + "-" + name, parent, value.getFloat("radius", 1f), value.getInt("sectorSize", 0));
if(value.has("mesh")){ if(value.has("mesh")){