Merge pull request #2474 from DinoFengz/patch-1

Update RemoveMobsListener.java
BentoBoxWorld · Aug 21, 2024 · 6cbbdad · 6cbbdad
2 parents fdbb248 + 9305bf7
commit 6cbbdad
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListener.java
@@ -24,15 +24,20 @@ public void onUserTeleport(PlayerTeleportEvent e) {
                 || e.getCause().equals(TeleportCause.SPECTATE)) {
             return;
         }
-        // Return if this is a small teleport
-        if (e.getTo().getWorld().equals(e.getPlayer().getWorld()) &&
-                e.getTo().distanceSquared(e.getPlayer().getLocation()) < getPlugin().getSettings().getClearRadius() * getPlugin().getSettings().getClearRadius()) {
-            return;
-        }
-        // Only process if flag is active
-        if (getIslands().locationIsOnIsland(e.getPlayer(), e.getTo()) && Flags.REMOVE_MOBS.isSetForWorld(e.getTo().getWorld())) {
-            Bukkit.getScheduler().runTask(getPlugin(), () -> getIslands().clearArea(e.getTo()));
+
+        if(e.getTo() != null) {
+            // Return if this is a small teleport
+            if (e.getTo().getWorld().equals(e.getPlayer().getWorld()) &&
+                    e.getTo().distanceSquared(e.getPlayer().getLocation()) < getPlugin().getSettings().getClearRadius() * getPlugin().getSettings().getClearRadius()) {
+                return;
+            }
+
+            // Only process if flag is active
+            if (getIslands().locationIsOnIsland(e.getPlayer(), e.getTo()) && Flags.REMOVE_MOBS.isSetForWorld(e.getTo().getWorld())) {
+                Bukkit.getScheduler().runTask(getPlugin(), () -> getIslands().clearArea(e.getTo()));
+            }
         }
+
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)