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

Don't force player out of vehicle on teleport. Fixes #582 (#833)

Browse Source
This commit is contained in:
Ryan 2016-08-26 22:29:22 -04:00 committed by Blinky™
parent ee64f7c4ff
commit 58828d7924
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 (LocationUtil.isBlockUnsafeForUser(teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) {
if (ess.getSettings().isTeleportSafetyEnabled()) { if (ess.getSettings().isTeleportSafetyEnabled()) {
if (teleportee.getBase().isInsideVehicle()) {
teleportee.getBase().leaveVehicle();
}
if (ess.getSettings().isForceDisableTeleportSafety()) { if (ess.getSettings().isForceDisableTeleportSafety()) {
teleportee.getBase().teleport(loc, cause); teleportee.getBase().teleport(loc, cause);
} else { } 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())); throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
} }
} else { } else {
if (teleportee.getBase().isInsideVehicle()) {
teleportee.getBase().leaveVehicle();
}
if (ess.getSettings().isForceDisableTeleportSafety()) { if (ess.getSettings().isForceDisableTeleportSafety()) {
teleportee.getBase().teleport(loc, cause); teleportee.getBase().teleport(loc, cause);
} else { } else {