Upstream/Boxed
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Boxed.git synced 2024-12-03 13:23:32 +01:00
Code Issues Projects Releases Wiki Activity

Adjust how tp is prevented. #70

Browse Source
This commit is contained in:
tastybento 2024-06-22 22:48:01 -07:00
parent ab108875f7
commit cd5936d746
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/world/bentobox/boxed/listeners/EnderPearlListener.java
View File

@ -45,15 +45,16 @@ public class EnderPearlListener implements Listener {
) {
return;
}
User u = User.getInstance(e.getPlayer());
// If the to-location is outside the box, cancel it
if (e.getTo() != null) {
Island i = addon.getIslands().getIsland(e.getFrom().getWorld(), u);
if (i == null || !i.onIsland(e.getTo())) {
u.sendMessage("boxed.general.errors.no-teleport-outside");
e.setCancelled(true);
}
addon.getIslands().getIslandAt(e.getTo()).ifPresent(i -> {
if (!i.onIsland(e.getTo())) {
u.sendMessage("boxed.general.errors.no-teleport-outside");
e.setCancelled(true);
}
});
}
}
@ -77,7 +78,7 @@ public class EnderPearlListener implements Listener {
if (is == null) {
return; // Nothing to do
}
// Get the box that the player is in
addon.getIslands().getIslandAt(u.getLocation()).ifPresent(fromIsland -> {
// Check that it is their box