From 4c5d96a3e5ba640e5112fa30872bd58aaea7ad56 Mon Sep 17 00:00:00 2001
From: Risto Lahtela <24460436+AuroraLS3@users.noreply.github.com>
Date: Fri, 2 Jul 2021 21:07:22 +0300
Subject: [PATCH] Fixed null serialization for the manual json creation

---
 .../java/com/djrapitops/plan/gathering/domain/GMTimes.java    | 4 ++--
 .../java/com/djrapitops/plan/gathering/domain/WorldTimes.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/GMTimes.java b/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/GMTimes.java
index 9b5a58af9..79ce61e64 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/GMTimes.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/GMTimes.java
@@ -137,8 +137,8 @@ public class GMTimes extends TimeKeeper {
                         .map(entry -> "\"" + entry.getKey() + "\": " + entry.getValue())
                         .iterator(), ",").build() +
                 "  }," +
-                "  \"state\": \"" + state + "\"," +
-                "  \"lastStateChange\": " + lastStateChange +
+                (state != null ? "\"state\": \"" + state + "\"," : "\"state\": null,") +
+                "\"lastStateChange\": " + lastStateChange +
                 "}";
     }
 }
\ No newline at end of file
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/WorldTimes.java b/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/WorldTimes.java
index e0cefaef8..b22f7bb9d 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/WorldTimes.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/WorldTimes.java
@@ -206,8 +206,8 @@ public class WorldTimes {
                         .map(entry -> "\"" + entry.getKey() + "\": " + entry.getValue().toJson())
                         .iterator(), ",").build() +
                 "  }," +
-                "  \"currentWorld\": \"" + currentWorld + "\"," +
-                "  \"currentGamemode\": \"" + currentGamemode + "\"" +
+                (currentWorld != null ? "\"currentWorld\": \"" + currentWorld + "\"," : "\"currentWorld\": null,") +
+                (currentGamemode != null ? "\"currentGamemode\": \"" + currentGamemode + "\"" : "\"currentGamemode\": null") +
                 "}";
     }
 }