Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-27 18:41:28 +01:00
Code Issues Projects Releases Wiki Activity

Allow people with god & fly to teleport to unsafe locations even when teleport safety is disabled.

Browse Source
This commit is contained in:
KHobbits 2014-07-12 16:33:50 +01:00
parent a2c692af39
commit 4e6c98ac57
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Teleport.java
View File

@ -102,7 +102,7 @@ public class Teleport implements net.ess3.api.ITeleport
teleportee.setLastLocation(); teleportee.setLastLocation();
final Location loc = target.getLocation(); 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()) if (ess.getSettings().isTeleportSafetyEnabled())
{ {

22
Essentials/src/com/earth2me/essentials/utils/LocationUtil.java
View File

@ -222,6 +222,22 @@ public class LocationUtil
return HOLLOW_MATERIALS.contains(world.getBlockAt(x, y - 1, z).getType().getId()); 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) public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
{ {
if (isBlockDamaging(world, x, y, 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 public static Location getSafeDestination(final IUser user, final Location loc) throws Exception
{ {
if (loc.getWorld().equals(user.getBase().getWorld()) if (user.getBase().isOnline() && loc.getWorld().equals(user.getBase().getWorld())
&& ((user.getBase().getGameMode() == GameMode.CREATIVE && (user.getBase().getGameMode() == GameMode.CREATIVE || user.isGodModeEnabled())
|| user.isGodModeEnabled()) && user.getBase().getAllowFlight())) && user.getBase().getAllowFlight())
{ {
if (shouldFly(loc)) if (shouldFly(loc))
{ {