TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Make sure we leave any vehicles before teleporting.

Browse source
This commit is contained in:
KHobbits 2014-02-02 15:02:06 +00:00
parent 18b31a7e50
commit 161862bc53
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/Teleport.java
View file

@ -105,6 +105,10 @@ public class Teleport implements net.ess3.api.ITeleport
{ {
if (ess.getSettings().isTeleportSafetyEnabled()) if (ess.getSettings().isTeleportSafetyEnabled())
{ {
if (teleportee.getBase().isInsideVehicle())
{
teleportee.getBase().leaveVehicle();;
}
teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, loc)); teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, loc));
} }
else else
@ -114,6 +118,10 @@ public class Teleport implements net.ess3.api.ITeleport
} }
else else
{ {
if (teleportee.getBase().isInsideVehicle())
{
teleportee.getBase().leaveVehicle();;
}
teleportee.getBase().teleport(loc); teleportee.getBase().teleport(loc);
} }
} }