From 93a2b484a1a2259bcf060b71b4b3aa435dcd6d54 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 12 Jul 2014 16:33:50 +0100 Subject: Allow people with god & fly to teleport to unsafe locations even when teleport safety is disabled. --- .../src/com/earth2me/essentials/Teleport.java | 2 +- .../earth2me/essentials/utils/LocationUtil.java | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 9fc153d92..4858ad423 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -102,7 +102,7 @@ public class Teleport implements net.ess3.api.ITeleport teleportee.setLastLocation(); final Location loc = target.getLocation(); - if (LocationUtil.isBlockUnsafe(loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) + if (LocationUtil.isBlockUnsafeForUser(teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) { if (ess.getSettings().isTeleportSafetyEnabled()) { diff --git a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java b/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java index aaaa8fc06..7a98a577f 100644 --- a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java +++ b/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java @@ -222,6 +222,22 @@ public class LocationUtil return HOLLOW_MATERIALS.contains(world.getBlockAt(x, y - 1, z).getType().getId()); } + public static boolean isBlockUnsafeForUser(final IUser user, final World world, final int x, final int y, final int z) + { + if (user.getBase().isOnline() && world.equals(user.getBase().getWorld()) + && (user.getBase().getGameMode() == GameMode.CREATIVE || user.isGodModeEnabled()) + && user.getBase().getAllowFlight()) + { + return false; + } + + if (isBlockDamaging(world, x, y, z)) + { + return true; + } + return isBlockAboveAir(world, x, y, z); + } + public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z) { if (isBlockDamaging(world, x, y, z)) @@ -265,9 +281,9 @@ public class LocationUtil public static Location getSafeDestination(final IUser user, final Location loc) throws Exception { - if (loc.getWorld().equals(user.getBase().getWorld()) - && ((user.getBase().getGameMode() == GameMode.CREATIVE - || user.isGodModeEnabled()) && user.getBase().getAllowFlight())) + if (user.getBase().isOnline() && loc.getWorld().equals(user.getBase().getWorld()) + && (user.getBase().getGameMode() == GameMode.CREATIVE || user.isGodModeEnabled()) + && user.getBase().getAllowFlight()) { if (shouldFly(loc)) { -- cgit v1.2.3