From 49f3ef443a497eaa7ea800800cfeb9e5ca0f1b42 Mon Sep 17 00:00:00 2001
From: SoSeDiK <mrsosedik@gmail.com>
Date: Wed, 28 Dec 2022 00:56:19 +0200
Subject: [PATCH] Expose pre-collision moving velocity to
 VehicleBlockCollisionEvent (#8457)

---
 ...sion-moving-velocity-to-VehicleBlock.patch | 49 +++++++++++++++++++
 ...sion-moving-velocity-to-VehicleBlock.patch | 20 ++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 patches/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
 create mode 100644 patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch

diff --git a/patches/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
new file mode 100644
index 0000000000..2caf50707d
--- /dev/null
+++ b/patches/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SoSeDiK <mrsosedik@gmail.com>
+Date: Tue, 11 Oct 2022 23:30:32 +0300
+Subject: [PATCH] Expose pre-collision moving velocity to
+ VehicleBlockCollisionEvent
+
+
+diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
++++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
+ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
+     // private static final HandlerList handlers = new HandlerList(); // Paper - move HandlerList to VehicleCollisionEvent
+     private final Block block;
++    private final org.bukkit.util.Vector velocity; // Paper
+ 
++    // Paper start - Add pre-collision velocity
++    @Deprecated
+     public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block) {
++        this(vehicle, block, vehicle.getVelocity());
++    }
++
++    public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block, @NotNull final org.bukkit.util.Vector velocity) { // Paper - Added velocity
+         super(vehicle);
+         this.block = block;
++        this.velocity = velocity;
+     }
++    // Paper end
+ 
+     /**
+      * Gets the block the vehicle collided with
+@@ -0,0 +0,0 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
+     public Block getBlock() {
+         return block;
+     }
++
++    // Paper start
++    /**
++     * Gets velocity at which the vehicle collided with the block
++     *
++     * @return pre-collision moving velocity
++     */
++    @NotNull
++    public org.bukkit.util.Vector getVelocity() {
++        return velocity;
++    }
++    // Paper end
+ }
diff --git a/patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
new file mode 100644
index 0000000000..ecd084afa8
--- /dev/null
+++ b/patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SoSeDiK <mrsosedik@gmail.com>
+Date: Tue, 11 Oct 2022 23:30:32 +0300
+Subject: [PATCH] Expose pre-collision moving velocity to
+ VehicleBlockCollisionEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+                     }
+ 
+                     if (!bl.getType().isAir()) {
+-                        VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl);
++                        VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl, org.bukkit.craftbukkit.util.CraftVector.toBukkit(moveVector)); // Paper - Expose pre-collision velocity
+                         this.level.getCraftServer().getPluginManager().callEvent(event);
+                     }
+                 }