From 85e8ccc7f92294a821f5fc7b99e899ebd7a10af3 Mon Sep 17 00:00:00 2001
From: heyxmirko <lukasektomas1@seznam.cz>
Date: Sat, 14 Mar 2026 22:13:28 +0100
Subject: [PATCH 1/2] fix: eject player from vehicle before teleporting

---
 .../java/com/meteordevelopments/duels/teleport/Teleport.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java b/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java
index 9e57b80e..b8d8e526 100644
--- a/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java
+++ b/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java
@@ -1,6 +1,7 @@
 package com.meteordevelopments.duels.teleport;
 
 import com.meteordevelopments.duels.DuelsPlugin;
+import com.meteordevelopments.duels.api.event.match.MatchEndEvent;
 import com.meteordevelopments.duels.hook.hooks.EssentialsHook;
 import com.meteordevelopments.duels.util.Loadable;
 import com.meteordevelopments.duels.util.Log;
@@ -57,6 +58,10 @@ public void tryTeleport(final Player player, final Location location) {
             player.removePassenger(entity);
         }
 
+        if (player.isInsideVehicle()) {
+            player.leaveVehicle();
+        }
+
         player.closeInventory();
 
         if (essentials != null) {

From 8a8b55b133243b9571842eff491fcb8950fe7dd8 Mon Sep 17 00:00:00 2001
From: heyxmirko <lukasektomas1@seznam.cz>
Date: Sat, 14 Mar 2026 22:19:50 +0100
Subject: [PATCH 2/2] remove unused import

---
 .../java/com/meteordevelopments/duels/teleport/Teleport.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java b/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java
index b8d8e526..4ace7a2c 100644
--- a/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java
+++ b/duels-plugin/src/main/java/com/meteordevelopments/duels/teleport/Teleport.java
@@ -1,7 +1,6 @@
 package com.meteordevelopments.duels.teleport;
 
 import com.meteordevelopments.duels.DuelsPlugin;
-import com.meteordevelopments.duels.api.event.match.MatchEndEvent;
 import com.meteordevelopments.duels.hook.hooks.EssentialsHook;
 import com.meteordevelopments.duels.util.Loadable;
 import com.meteordevelopments.duels.util.Log;