From 2e4d545955dc69109ab1af89b4d5a26a9f1f0f8e Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Sun, 10 Oct 2021 23:17:29 +0200
Subject: [PATCH] Changes the vehicle check to prevent players in boats from
 leaving their boat to teleport

---
 .../knarcraft/stargate/listener/PlayerEventListener.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
index 55d30f4..bdab69a 100644
--- a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
+++ b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
@@ -109,11 +109,10 @@ public class PlayerEventListener implements Listener {
 
         //Teleport the vehicle to the player
         Entity playerVehicle = player.getVehicle();
+        if (playerVehicle != null && !Stargate.handleVehicles) {
+            return;
+        }
         if (playerVehicle != null && !(playerVehicle instanceof Boat) && !(playerVehicle instanceof RideableMinecart)) {
-            if (!Stargate.handleVehicles) {
-                return;
-            }
-
             //Make sure the horse can be sat on
             if (playerVehicle instanceof AbstractHorse horse) {
                 //Make sure the horse is properly tamed