From 0496d2108c3ff08669fa5eaae472ac37b938ca26 Mon Sep 17 00:00:00 2001
From: WayZer <himc.wicp@gmail.com>
Date: Fri, 12 May 2023 10:21:05 +0800
Subject: [PATCH] fix NPE in SpawnGroup.write (#8584)

* Update SpawnGroup.java

* Update contributors

* No Objects.isNull
---
 core/assets/contributors                | 3 ++-
 core/src/mindustry/game/SpawnGroup.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/assets/contributors b/core/assets/contributors
index 20e5b1e10c..4a2aee81aa 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -154,4 +154,5 @@ zenonet
 AyuKo-o
 JojoFR1
 Xasmedy
-xStaBUx
\ No newline at end of file
+xStaBUx
+WayZer
diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java
index d155c8bc60..0b2aea3bc4 100644
--- a/core/src/mindustry/game/SpawnGroup.java
+++ b/core/src/mindustry/game/SpawnGroup.java
@@ -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"));