From 054934fded9aa48c96a8ad4470d2f4f96036ca9f Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sat, 2 May 2020 17:53:35 -0700
Subject: [PATCH] Added null checking for world when changing worlds

https://github.com/BentoBoxWorld/BentoBox/issues/1336
---
 .../bentobox/listeners/JoinLeaveListener.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
index 23b8bd2ed..e1aa32024 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
@@ -55,7 +55,7 @@ public class JoinLeaveListener implements Listener {
         if (!players.isKnown(playerUUID)) {
             firstTime(user);
         }
-        
+
         // Make sure the player is loaded into the cache or create the player if they don't exist
         players.addPlayer(playerUUID);
 
@@ -121,7 +121,7 @@ public class JoinLeaveListener implements Listener {
                 }
             }
         });
-        
+
     }
 
     /**
@@ -130,8 +130,11 @@ public class JoinLeaveListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerSwitchWorld(final PlayerChangedWorldEvent event) {
+        World world = Util.getWorld(event.getPlayer().getWorld());
         // Clear inventory if required
-        clearPlayersInventory(Util.getWorld(event.getPlayer().getWorld()), User.getInstance(event.getPlayer()));
+        if (world != null) {
+            clearPlayersInventory(world, User.getInstance(event.getPlayer()));
+        }
     }
 
 
@@ -214,13 +217,13 @@ public class JoinLeaveListener implements Listener {
 
                     // Call Protection Range Change event. Does not support cancelling.
                     IslandEvent.builder()
-                        .island(island)
-                        .location(island.getCenter())
-                        .reason(IslandEvent.Reason.RANGE_CHANGE)
-                        .involvedPlayer(user.getUniqueId())
-                        .admin(true)
-                        .protectionRange(range, oldRange)
-                        .build();
+                    .island(island)
+                    .location(island.getCenter())
+                    .reason(IslandEvent.Reason.RANGE_CHANGE)
+                    .involvedPlayer(user.getUniqueId())
+                    .admin(true)
+                    .protectionRange(range, oldRange)
+                    .build();
                 }
             }
         });