GH-345 Fix enforcing region knockback for mounted combat players

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackRegionController.java

@@ -9,12 +9,15 @@
 import java.util.Optional;
 import org.bukkit.Location;
 import org.bukkit.Server;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.vehicle.VehicleMoveEvent;
+import org.spigotmc.event.entity.EntityMountEvent;
 
 public class KnockbackRegionController implements Listener {
 
@@ -89,6 +92,67 @@ void onPlayerTeleport(PlayerTeleportEvent event) {
         }
     }
 
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    void onVehicleMove(VehicleMoveEvent event) {
+        Location locationTo = event.getTo();
+        Location locationFrom = event.getFrom();
+
+        if (locationTo.getBlockX() == locationFrom.getBlockX()
+            && locationTo.getBlockY() == locationFrom.getBlockY()
+            && locationTo.getBlockZ() == locationFrom.getBlockZ()) {
+            return;
+        }
+
+        for (Entity passenger : event.getVehicle().getPassengers()) {
+            if (!(passenger instanceof Player player)) {
+                continue;
+            }
+
+            if (!this.fightManager.isInCombat(player.getUniqueId())) {
+                continue;
+            }
+
+            Optional<Region> regionOptional = this.regionProvider.getRegion(locationTo);
+            if (regionOptional.isEmpty()) {
+                return;
+            }
+
+            Region region = regionOptional.get();
+            if (region.contains(locationFrom)) {
+                this.knockbackService.knockback(region, player);
+                this.knockbackService.forceKnockbackLater(player, region);
+            } else {
+                this.knockbackService.knockbackLater(region, player, Duration.ofMillis(50));
+            }
+
+            this.noticeService.create()
+                .player(player.getUniqueId())
+                .notice(config -> config.messagesSettings.cantEnterOnRegion)
+                .send();
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    void onEntityMount(EntityMountEvent event) {
+        if (!(event.getEntity() instanceof Player player)) {
+            return;
+        }
+
+        if (!this.fightManager.isInCombat(player.getUniqueId())) {
+            return;
+        }
+
+        if (!this.regionProvider.isInRegion(event.getMount().getLocation())) {
+            return;
+        }
+
+        event.setCancelled(true);
+        this.noticeService.create()
+            .player(player.getUniqueId())
+            .notice(config -> config.messagesSettings.cantEnterOnRegion)
+            .send();
+    }
+
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     void onTag(FightTagEvent event) {
         Player player = this.server.getPlayer(event.getPlayer());

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackService.java

@@ -41,19 +41,22 @@ public void forceKnockbackLater(Player player, Region region) {
 
         insideRegion.put(player.getUniqueId(), region);
 
-        scheduler.runLater(
-            player.getLocation(), () -> {
-                insideRegion.remove(player.getUniqueId());
-                Location playerLocation = player.getLocation();
-                if (!region.contains(playerLocation) && !regionProvider.isInRegion(playerLocation)) {
-                    return;
-                }
-
-                Location location =
-                    generate(playerLocation, Point2D.from(region.getMin()), Point2D.from(region.getMax()));
-
-                PaperLib.teleportAsync(player, location, TeleportCause.PLUGIN);
-            }, this.config.knockback.forceDelay);
+        scheduler.runLater(player.getLocation(), () -> {
+            insideRegion.remove(player.getUniqueId());
+
+            Location playerLocation = player.getLocation();
+            if (!region.contains(playerLocation) && !regionProvider.isInRegion(playerLocation)) {
+                return;
+            }
+
+            if (player.isInsideVehicle()) {
+                player.leaveVehicle();
+            }
+
+            Location location = generate(playerLocation, Point2D.from(region.getMin()), Point2D.from(region.getMax()));
+
+            PaperLib.teleportAsync(player, location, TeleportCause.PLUGIN);
+        }, this.config.knockback.forceDelay);
     }
 
     private Location generate(Location playerLocation, Point2D minX, Point2D maxX) {
@@ -68,6 +71,10 @@ private Location generate(Location playerLocation, Point2D minX, Point2D maxX) {
     }
 
     public void knockback(Region region, Player player) {
+        if (player.isInsideVehicle()) {
+            player.leaveVehicle();
+        }
+
         Point point = region.getCenter();
         Location subtract = player.getLocation().subtract(point.x(), 0, point.z());