Skip to content

Commit

Permalink
fix NPE in SpawnGroup.write (#8584)
Browse files Browse the repository at this point in the history
* Update SpawnGroup.java

* Update contributors

* No Objects.isNull
  • Loading branch information
way-zer authored May 12, 2023
1 parent 06e63da commit 0496d21
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion core/assets/contributors
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,5 @@ zenonet
AyuKo-o
JojoFR1
Xasmedy
xStaBUx
xStaBUx
WayZer
2 changes: 1 addition & 1 deletion core/src/mindustry/game/SpawnGroup.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public void read(Json json, JsonValue data){
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"));


Expand Down

0 comments on commit 0496d21

Please sign in to comment.