aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0837-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0837-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch')
-rw-r--r--patches/server/0837-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/server/0837-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0837-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
new file mode 100644
index 0000000000..3352d79d45
--- /dev/null
+++ b/patches/server/0837-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 5b89426cdca61ecc99f53b64d1e088e043effcfd..576cef82f7ea57642430897de2e5212cae234701 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -944,6 +944,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 {
+@@ -1028,7 +1029,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);
+ }
+ }