From 69d3ac9dc2513beebca79ad7e4df52f765776f2d Mon Sep 17 00:00:00 2001
From: Maxim <maxim235@gmx.de>
Date: Mon, 20 Mar 2023 20:29:38 +0100
Subject: Added some null checks to loadInstance (#1806)

---
 .../misc/spaceprojects/SpaceProjectWorldSavedData.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/common/misc')

diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java
index d24ead8f88..23a7b7bbb1 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java
@@ -117,8 +117,16 @@ public class SpaceProjectWorldSavedData extends WorldSavedData {
     }
 
     private static void loadInstance(World aWorld) {
-        spaceTeamProjects.clear();
-        spaceTeams.clear();
+        if (spaceTeamProjects != null) {
+            spaceTeamProjects.clear();
+        } else {
+            spaceTeamProjects = new HashMap<>();
+        }
+        if (spaceTeams != null) {
+            spaceTeams.clear();
+        } else {
+            spaceTeams = new HashMap<>();
+        }
         spaceTeamsFile = new File(aWorld.getSaveHandler().getWorldDirectory(), SPACE_TEAMS_JSON);
         teamProjectsFile = new File(aWorld.getSaveHandler().getWorldDirectory(), SPACE_TEAM_PROJECTS_JSON);
         MapStorage tStorage = aWorld.mapStorage;
-- 
cgit