Add hidden config to stop throwing errors for passengers (#3445)

EssentialsX · Jul 2, 2020 · 0b4ee9e · 0b4ee9e
1 parent 65f8883
commit 0b4ee9e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/Essentials/src/com/earth2me/essentials/AsyncTeleport.java b/Essentials/src/com/earth2me/essentials/AsyncTeleport.java
@@ -164,7 +164,7 @@ protected void nowAsync(IUser teleportee, ITarget target, TeleportCause cause, C
         }
         teleportee.setLastLocation();
 
-        if (!teleportee.getBase().isEmpty()) {
+        if (!ess.getSettings().isForcePassengerTeleport() && !teleportee.getBase().isEmpty()) {
             if (!ess.getSettings().isTeleportPassengerDismount()) {
                 future.completeExceptionally(new Exception(tl("passengerTeleportFail")));
                 return;

diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java
@@ -125,6 +125,8 @@ public interface ISettings extends IConf {
 
     boolean isTeleportPassengerDismount();
 
+    boolean isForcePassengerTeleport();
+
     double getTeleportCooldown();
 
     double getTeleportDelay();

diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -167,6 +167,11 @@ public boolean isTeleportPassengerDismount() {
         return config.getBoolean("teleport-passenger-dismount", true);
     }
 
+    @Override
+    public boolean isForcePassengerTeleport() {
+        return config.getBoolean("force-passenger-teleportation", false);
+    }
+
     @Override
     public double getTeleportDelay() {
         return config.getDouble("teleport-delay", 0);