AreaEnterExit: vehicle support

DenizenScript · May 24, 2022 · 407c43a · 407c43a
1 parent 118df28
commit 407c43a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/AreaEnterExitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/AreaEnterExitScriptEvent.java
@@ -17,6 +17,7 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityTeleportEvent;
 import org.bukkit.event.player.*;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
 
@@ -313,6 +314,13 @@ public void onTeleport(PlayerTeleportEvent event) {
             processNewPosition(new EntityTag(event.getPlayer()), event.getTo(), event);
         }
 
+        @EventHandler
+        public void onTeleport(EntityTeleportEvent event) {
+            if (!onlyTrackPlayers) {
+                processNewPosition(new EntityTag(event.getEntity()), event.getTo(), event);
+            }
+        }
+
         @EventHandler
         public void onWorldChange(PlayerChangedWorldEvent event) {
             processNewPosition(new EntityTag(event.getPlayer()), event.getPlayer().getLocation(), event);
@@ -323,6 +331,9 @@ public void onVehicleMove(VehicleMoveEvent event) {
             if (LocationTag.isSameBlock(event.getFrom(), event.getTo())) {
                 return;
             }
+            if (!onlyTrackPlayers) {
+                processNewPosition(new EntityTag(event.getVehicle()), event.getTo(), event);
+            }
             for (Entity entity : event.getVehicle().getPassengers()) {
                 if (!onlyTrackPlayers || EntityTag.isPlayer(entity)) {
                     processNewPosition(new EntityTag(entity), event.getTo(), event);