From b6a08ec71298c67e24d9e51ea21bf3799620233b Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Mon, 9 Aug 2021 11:44:13 -0700
Subject: [PATCH] Fix force-disable-teleport-safety enforcing world border
 (#4371)

---
 .../src/main/java/com/earth2me/essentials/AsyncTeleport.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java
index 1befe4ecb6c..e3026b673d4 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java
@@ -183,7 +183,7 @@ protected void nowAsync(final IUser teleportee, final ITarget target, final Tele
         }
 
         final Location targetLoc = target.getLocation();
-        if (ess.getSettings().isTeleportSafetyEnabled() && LocationUtil.isBlockOutsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX(), targetLoc.getBlockZ())) {
+        if (ess.getSettings().isTeleportSafetyEnabled() && !ess.getSettings().isForceDisableTeleportSafety() && LocationUtil.isBlockOutsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX(), targetLoc.getBlockZ())) {
             targetLoc.setX(LocationUtil.getXInsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX()));
             targetLoc.setZ(LocationUtil.getZInsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockZ()));
         }