From 879b6bf8af885f395996b60a02214c01c3d44d56 Mon Sep 17 00:00:00 2001
From: Lorenzo <hello@lorenzo0111.me>
Date: Wed, 19 Jun 2024 14:02:53 +0200
Subject: [PATCH] Fixed teleport Closes #297

---
 build.gradle.kts                              |  6 +++---
 src/main/java/me/zombie_striker/qav/Main.java | 13 ++++++++-----
 src/main/resources/changelog.txt              | 10 ++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1e42b06..7c69929 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "me.zombie_striker"
-version = "2.3.9-SNAPSHOT"
+version = "2.3.9"
 description = "QualityArmoryVehicles"
 
 java.sourceCompatibility = JavaVersion.VERSION_1_8
@@ -35,12 +35,12 @@ dependencies {
     implementation("com.github.cryptomorin:XSeries:11.0.0")
     implementation("net.jodah:expiringmap:0.5.11")
     implementation("org.codemc.worldguardwrapper:worldguardwrapper:1.2.0-SNAPSHOT")
-    implementation("dev.triumphteam:triumph-gui:3.1.7")
+    implementation("dev.triumphteam:triumph-gui:3.1.10")
     compileOnly("org.jetbrains:annotations:24.1.0")
 
     // API
     compileOnly("net.kyori:adventure-api:4.17.0")
-    compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
 
     // Compatibilities
     compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
diff --git a/src/main/java/me/zombie_striker/qav/Main.java b/src/main/java/me/zombie_striker/qav/Main.java
index d4d0877..37a1c34 100644
--- a/src/main/java/me/zombie_striker/qav/Main.java
+++ b/src/main/java/me/zombie_striker/qav/Main.java
@@ -35,6 +35,7 @@
 import me.zombie_striker.qav.vehicles.AbstractVehicle;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -288,11 +289,13 @@ public void run() {
 								PlayerExitQAVehicleEvent event = new PlayerExitQAVehicleEvent(ve,player);
 								Bukkit.getPluginManager().callEvent(event);
 
-								if (removeVehicleOnDismount && QualityArmoryVehicles.isVehicle(player.getVehicle())) {
-									VehicleEntity vehicle = QualityArmoryVehicles.getVehicleEntityByEntity(player.getVehicle());
-									if (vehicle != null && vehicle.getDriverSeat().equals(player.getVehicle())) {
-										VehicleUtils.callback(vehicle,player, "Dismount");
-									}
+								if (antiCheatHook) {
+									Location location = player.getVehicle().getLocation();
+									player.teleport(location);
+								}
+
+								if (removeVehicleOnDismount) {
+									VehicleUtils.callback(ve, player, "Dismount");
 								}
 							}
 
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 295eff2..9c55b9a 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,3 +1,13 @@
+2.3.9
+  Changelog:
+    - 1.21 support
+    - Added anticheat workaround
+
+2.3.8
+  Changelog:
+    - 1.20.6 support
+    - Updated NMS system
+
 2.3.7
   Changelog:
     - 1.20.2 support