TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-25 16:09:44 +00:00
Code Issues Projects Releases Wiki Activity

Restore teleporting to middle of block, when flying and unsafe is enabled.

Browse source
This commit is contained in:
KHobbits 2014-02-02 16:43:31 +00:00
parent 882ebae257
commit 016b39726c
2 changed files with 13 additions and 3 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

@ -122,7 +122,7 @@ public class Teleport implements net.ess3.api.ITeleport
{ {
teleportee.getBase().leaveVehicle(); teleportee.getBase().leaveVehicle();
} }
teleportee.getBase().teleport(loc); teleportee.getBase().teleport(LocationUtil.getRoundedDestination(loc));
} }
} }

14
Essentials/src/com/earth2me/essentials/utils/LocationUtil.java
View file

@ -248,6 +248,16 @@ public class LocationUtil
} }
return false; return false;
} }
// Not needed if using getSafeDestination(loc)
public static Location getRoundedDestination(final Location loc)
{
final World world = loc.getWorld();
int x = loc.getBlockX();
int y = (int)Math.round(loc.getY());
int z = loc.getBlockZ();
return new Location(world, x + 0.5, y, z + 0.5, loc.getYaw(), loc.getPitch());
}
public static Location getSafeDestination(final IUser user, final Location loc) throws Exception public static Location getSafeDestination(final IUser user, final Location loc) throws Exception
{ {
@ -259,11 +269,11 @@ public class LocationUtil
{ {
user.getBase().setFlying(true); user.getBase().setFlying(true);
} }
return loc; return getRoundedDestination(loc);
} }
return getSafeDestination(loc); return getSafeDestination(loc);
} }
public static Location getSafeDestination(final Location loc) throws Exception public static Location getSafeDestination(final Location loc) throws Exception
{ {
if (loc == null || loc.getWorld() == null) if (loc == null || loc.getWorld() == null)