minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-15 19:14:18 +02:00
Code Issues 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 938e539463
commit f4cf63c0ce
1 changed files with 8 additions and 0 deletions
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);
} }
} }