From 58828d79240c449915f581c1eb75937083a7c675 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 26 Aug 2016 22:29:22 -0400 Subject: [PATCH] Don't force player out of vehicle on teleport. Fixes #582 (#833) --- Essentials/src/com/earth2me/essentials/Teleport.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index f68e283c3..e45523a0a 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -121,9 +121,6 @@ public class Teleport implements net.ess3.api.ITeleport { if (LocationUtil.isBlockUnsafeForUser(teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) { if (ess.getSettings().isTeleportSafetyEnabled()) { - if (teleportee.getBase().isInsideVehicle()) { - teleportee.getBase().leaveVehicle(); - } if (ess.getSettings().isForceDisableTeleportSafety()) { teleportee.getBase().teleport(loc, cause); } else { @@ -133,9 +130,6 @@ public class Teleport implements net.ess3.api.ITeleport { throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } } else { - if (teleportee.getBase().isInsideVehicle()) { - teleportee.getBase().leaveVehicle(); - } if (ess.getSettings().isForceDisableTeleportSafety()) { teleportee.getBase().teleport(loc, cause); } else {