From 0bed402766ac549685557bb0a10dc33327f87cc8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 00:40:44 +0000
Subject: [PATCH 1/2] Initial plan


From cdd270ccdcfab4f31d67c1e365ac4aa755c744d0 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 01:01:57 +0000
Subject: [PATCH 2/2] Fix testOnPlayerLeaveIslandVanillaNether/End to correctly
 test early-return for vanilla worlds

Co-authored-by: tastybento <4407265+tastybento@users.noreply.github.com>
---
 .../bentobox/border/listeners/PlayerListener.java  |  2 +-
 .../border/listeners/PlayerListenerTest.java       | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/world/bentobox/border/listeners/PlayerListener.java b/src/main/java/world/bentobox/border/listeners/PlayerListener.java
index 20067a4..536d589 100644
--- a/src/main/java/world/bentobox/border/listeners/PlayerListener.java
+++ b/src/main/java/world/bentobox/border/listeners/PlayerListener.java
@@ -349,7 +349,7 @@ public void onPlayerLeaveIsland(PlayerMoveEvent e) {
                 }
                 Util.teleportAsync(p, targetPos).thenRun(() -> inTeleport.remove(p.getUniqueId()));
             } else {
-                BentoBox.getInstance().logDebug("Ray trace did not found a valid position for player " + p.getName() + " so teleporting them back to their island home.");
+                BentoBox.getInstance().logDebug("Ray trace did not find a valid position for player " + p.getName() + " so teleporting them back to their island home.");
                 Util.teleportAsync(p, i.getHome("")).thenRun(() -> inTeleport.remove(p.getUniqueId()));
             }
 
diff --git a/src/test/java/world/bentobox/border/listeners/PlayerListenerTest.java b/src/test/java/world/bentobox/border/listeners/PlayerListenerTest.java
index 678f06d..6c6a85a 100644
--- a/src/test/java/world/bentobox/border/listeners/PlayerListenerTest.java
+++ b/src/test/java/world/bentobox/border/listeners/PlayerListenerTest.java
@@ -327,14 +327,11 @@ public void testOnPlayerLeaveIslandReturnTeleportOutsideCheckNotInGameWorld() {
      */
     @Test
     public void testOnPlayerLeaveIslandVanillaNether() {
-        when(iwm.isIslandNether(any())).thenReturn(false); // vanilla nether, not island nether
-        when(iwm.isIslandEnd(any())).thenReturn(false);
-        when(island.onIsland(any())).thenReturn(false);
+        when(addon.inGameWorld(any())).thenReturn(false); // vanilla nether is not a game world
         settings.setReturnTeleport(true);
         PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
         pl.onPlayerLeaveIsland(event);
-        verify(addon, times(2)).getIslands();
-        assertTrue(event.isCancelled());
+        verify(addon, never()).getIslands();
     }
 
     /**
@@ -343,14 +340,11 @@ public void testOnPlayerLeaveIslandVanillaNether() {
      */
     @Test
     public void testOnPlayerLeaveIslandVanillaEnd() {
-        when(iwm.isIslandNether(any())).thenReturn(false);
-        when(iwm.isIslandEnd(any())).thenReturn(false); // vanilla end, not island end
-        when(island.onIsland(any())).thenReturn(false);
+        when(addon.inGameWorld(any())).thenReturn(false); // vanilla end is not a game world
         settings.setReturnTeleport(true);
         PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
         pl.onPlayerLeaveIsland(event);
-        verify(addon, times(2)).getIslands();
-        assertTrue(event.isCancelled());
+        verify(addon, never()).getIslands();
     }
 
     /**