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

fix NPE in SpawnGroup.write (#8584)

Browse Source 
* Update SpawnGroup.java

* Update contributors

* No Objects.isNull
This commit is contained in:
WayZer
2023-05-12 10:21:05 +08:00
committed by GitHub
parent 06e63dad45
commit 0496d2108c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/contributors
View File

@@ -155,3 +155,4 @@ AyuKo-o
JojoFR1 JojoFR1
Xasmedy Xasmedy
xStaBUx xStaBUx
WayZer

2
core/src/mindustry/game/SpawnGroup.java
View File

@@ -138,7 +138,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
shieldScaling = data.getFloat("shieldScaling", 0); shieldScaling = data.getFloat("shieldScaling", 0);
unitAmount = data.getInt("amount", 1); unitAmount = data.getInt("amount", 1);
spawn = data.getInt("spawn", -1); spawn = data.getInt("spawn", -1);
if(data.has("payloads")) payloads = Seq.with(json.readValue(String[].class, data.get("payloads"))).map(s -> content.unit(s)); if(data.has("payloads")) payloads = Seq.with(json.readValue(String[].class, data.get("payloads"))).map(content::unit).removeAll(t -> t == null);
if(data.has("items")) items = json.readValue(ItemStack.class, data.get("items")); if(data.has("items")) items = json.readValue(ItemStack.class, data.get("items"));