From 737ad16ff6606b789dc3d04ff37cbf5093790046 Mon Sep 17 00:00:00 2001
From: Thomas Cordua-von Specht <tcvs@endercrest.com>
Date: Wed, 20 Jan 2021 15:48:22 -0800
Subject: [PATCH] Fix NPE in getSafeHomeLocation (#1650) (#1651)

---
 .../java/world/bentobox/bentobox/managers/IslandsManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
index 32c908dad..2524da6da 100644
--- a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -627,7 +627,7 @@ public class IslandsManager {
         // location
         if (plugin.getIslands().inTeam(world, user.getUniqueId())) {
             l = plugin.getIslands().getIslandLocation(world, user.getUniqueId());
-            if (isSafeLocation(l)) {
+            if (l != null && isSafeLocation(l)) {
                 plugin.getPlayers().setHomeLocation(user, l, number);
                 return l;
             } else {
@@ -640,7 +640,7 @@ public class IslandsManager {
             }
         } else {
             l = plugin.getIslands().getIslandLocation(world, user.getUniqueId());
-            if (isSafeLocation(l)) {
+            if (l != null && isSafeLocation(l)) {
                 plugin.getPlayers().setHomeLocation(user, l, number);
                 return l.clone().add(new Vector(0.5D,0,0.5D));
             }