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

Fixed #7728

Browse Source
This commit is contained in:
Anuken
2022-10-16 08:44:08 -04:00
parent 1ef1aeaaf3
commit 215633587d
4 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,11 +556,21 @@ public class ContentParser{
if(!value.has("sector") || !value.get("sector").isNumber()) throw new RuntimeException("SectorPresets must have a sector number.");
SectorPreset out = new SectorPreset(name, locate(ContentType.planet, value.getString("planet", "serpulo")), value.getInt("sector"));
value.remove("sector");
value.remove("planet");
SectorPreset out = new SectorPreset(name);
currentContent = out;
read(() -> readFields(out, value));
read(() -> {
Planet planet = locate(ContentType.planet, value.getString("planet", "serpulo"));
if(planet == null) throw new RuntimeException("Planet '" + value.getString("planet") + "' not found.");
out.initialize(planet, value.getInt("sector", 0));
value.remove("sector");
value.remove("planet");
readFields(out, value);
});
return out;
},
ContentType.planet, (TypeParser<Planet>)(mod, name, value) -> {