Move diffs around to compile without later ones applied

1 files changed, 28 insertions, 0 deletions

diff --git a/patches/server/0841-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0841-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
new file mode 100644
index 0000000000..21aca8cd32
--- /dev/null
+++ b/patches/server/0841-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SoSeDiK <[email protected]>
+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 ce52cd5d11e4422cb236761b5dff06daa9cad56b..6c8c7b3c701ba258610cef86997ff3bc13e37bcb 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -997,6 +997,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+     }
+ 
+     public void move(MoverType movementType, Vec3 movement) {
++        final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
+         if (this.noPhysics) {
+             this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
+         } else {
+@@ -1081,7 +1082,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+                     }
+ 
+                     if (!bl.getType().isAir()) {
+-                        VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl);
++                        VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl, org.bukkit.craftbukkit.util.CraftVector.toBukkit(originalMovement)); // Paper - Expose pre-collision velocity
+                         this.level.getCraftServer().getPluginManager().callEvent(event);
+                     }
+                 }