aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-03-20 20:29:38 +0100
committerGitHub <noreply@github.com>2023-03-20 20:29:38 +0100
commit69d3ac9dc2513beebca79ad7e4df52f765776f2d (patch)
tree0d8012ec08dfa0e5d3f6324a162edf60c155634f /src/main/java
parent59c64fef98b87d8ee2680eae2989a6a54ed8c425 (diff)
downloadGT5-Unofficial-69d3ac9dc2513beebca79ad7e4df52f765776f2d.tar.gz
GT5-Unofficial-69d3ac9dc2513beebca79ad7e4df52f765776f2d.tar.bz2
GT5-Unofficial-69d3ac9dc2513beebca79ad7e4df52f765776f2d.zip
Added some null checks to loadInstance (#1806)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java12
1 files changed, 10 insertions, 2 deletions
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;