From 61481dee44acd171697b64cfc0e1d12fa9a9b1e8 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Tue, 15 Jan 2019 08:33:14 -0800
Subject: [PATCH] Added null protection against null world values

---
 .../bentobox/database/json/adapters/LocationAdapter.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/database/json/adapters/LocationAdapter.java b/src/main/java/world/bentobox/bentobox/database/json/adapters/LocationAdapter.java
index 70687802d..ae6a05098 100644
--- a/src/main/java/world/bentobox/bentobox/database/json/adapters/LocationAdapter.java
+++ b/src/main/java/world/bentobox/bentobox/database/json/adapters/LocationAdapter.java
@@ -21,7 +21,7 @@ public class LocationAdapter extends TypeAdapter<Location> {
 
     @Override
     public void write(JsonWriter out, Location location) throws IOException {
-        if (location == null) {
+        if (location == null || location.getWorld() == null) {
             out.nullValue();
             return;
         }
@@ -33,8 +33,8 @@ public class LocationAdapter extends TypeAdapter<Location> {
         out.value(location.getYaw());
         out.value(location.getPitch());
         out.endArray();
-   }
-    
+    }
+
     @Override
     public Location read(JsonReader in) throws IOException {
         if (in.peek() == JsonToken.NULL) {