Fixed enter event

Closes #312
ZombieStriker · Nov 8, 2024 · 9d7138f · 9d7138f
1 parent ed13412
commit 9d7138f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
     mavenCentral()
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
     maven("https://jitpack.io")
-    maven("https://repo.dmulloy2.net/nexus/repository/public/")
+    maven("https://repo.dmulloy2.net/repository/public/")
     maven("https://repo.citizensnpcs.co/")
     maven("https://repo.glaremasters.me/repository/towny/")
     maven("https://mvn.lumine.io/repository/maven-public/") {
@@ -43,7 +43,7 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
 
     // Compatibilities
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
+    compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0")
     compileOnly("me.zombie_striker:QualityArmory:2.0.15")
     compileOnly("com.github.TownyAdvanced:Towny:0.100.4.7")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")

diff --git a/src/main/java/me/zombie_striker/qav/api/QualityArmoryVehicles.java b/src/main/java/me/zombie_striker/qav/api/QualityArmoryVehicles.java
@@ -213,18 +213,19 @@ public static void setAddPassager(VehicleEntity vehicleEntity, Player clicker, i
 
     @SuppressWarnings("deprecation")
     public static void addPlayerToCar(VehicleEntity ve, Player player, boolean allowDriverSeat) {
-        PlayerEnterQAVehicleEvent event = new PlayerEnterQAVehicleEvent(ve, player);
-        Bukkit.getPluginManager().callEvent(event);
-        if (event.isCanceled()) {
-            return;
-        }
         if (ve == null)
             return;
         if (ve.getDriverSeat() == null) {
             return;
         }
         if ((ve.getDriverSeat().getPassenger() == null && allowDriverSeat)
                 && (!Main.requirePermissionToDrive || PermissionHandler.canDrive(player, ve.getType()))) {
+            PlayerEnterQAVehicleEvent event = new PlayerEnterQAVehicleEvent(ve, player);
+            Bukkit.getPluginManager().callEvent(event);
+            if (event.isCanceled()) {
+                return;
+            }
+
             if (ve.getOwner() == null && Main.setOwnerIfNoneExist) {
                 ve.setOwner(player.getUniqueId());
                 if (MessagesConfig.MESSAGE_NOW_OWN_CAR.length() > 1) {
@@ -240,6 +241,12 @@ public static void addPlayerToCar(VehicleEntity ve, Player player, boolean allow
                 if (seatId < 0)
                     return;
 
+                PlayerEnterQAVehicleEvent event = new PlayerEnterQAVehicleEvent(ve, player);
+                Bukkit.getPluginManager().callEvent(event);
+                if (event.isCanceled()) {
+                    return;
+                }
+
                 ve.getType().playAnimation(ve, Animation.AnimationType.ENTER, seatId + "");
                 setAddPassager(ve, player, seatId);
             }

diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
@@ -1,3 +1,9 @@
+2.3.10
+  Changelog:
+    - Performance fixes
+    - Added target for remove command
+    - Bump dependencies
+
 2.3.9
   Changelog:
     - 1.21 support