Skip to content

Fix vanilla nether/end tests to correctly exercise early-return path in onPlayerLeaveIsland #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tastybento merged 3 commits into from
Mar 8, 2026
Merged

Fix vanilla nether/end tests to correctly exercise early-return path in onPlayerLeaveIsland #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bed402
Initial plan
Copilot Mar 8, 2026
cdd270c
Fix testOnPlayerLeaveIslandVanillaNether/End to correctly test early-…
Copilot Mar 8, 2026
cf303f1
Merge branch 'develop' into copilot/sub-pr-164-again
tastybento Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/world/bentobox/border/listeners/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ public void onPlayerLeaveIsland(PlayerMoveEvent e) {
}
Util.teleportAsync(p, targetPos).thenRun(() -> inTeleport.remove(p.getUniqueId()));
} else {
BentoBox.getInstance().logDebug("Ray trace found a valid safe position for player " + p.getName() + " and teleporting them there.");
Util.teleportAsync(p, targetPos).thenRun(() -> inTeleport.remove(p.getUniqueId()));
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()));
}

});
Expand Down
14 changes: 4 additions & 10 deletions src/test/java/world/bentobox/border/listeners/PlayerListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,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();
}

/**
Expand All @@ -311,14 +308,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();
}

/**
Expand Down
Loading