mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 15:02:03 -08:00
Code Issues 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/assets/contributors
View file

@ -154,4 +154,5 @@ zenonet
AyuKo-o
JojoFR1
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);
unitAmount = data.getInt("amount", 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"));