Merge pull request #2597 from BentoBoxWorld/2596_no_home_npe

Prevent NPE if player has no home island
BentoBoxWorld · Jan 14, 2025 · 6d2e729 · 6d2e729
2 parents c910247 + 1dd0fb5
commit 6d2e729
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -848,7 +848,8 @@ public Location getHomeLocation(@NonNull World world, @NonNull User user) {
      */
     @Nullable
     public Location getHomeLocation(@NonNull World world, @NonNull UUID uuid) {
-        return this.getPrimaryIsland(world, uuid).getHome("");
+        Island is = this.getPrimaryIsland(world, uuid);
+        return is == null ? null : is.getHome("");
     }
 
     /**