2022-12-27 23:56:19 +01:00
|
|
|
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
|
2024-10-30 14:31:03 +01:00
|
|
|
index 411ffaf842841709eaef48776e2c6ce4f524af05..5340d6d911a7e586468f2b7e2e74b3386d1dc72d 100644
|
2022-12-27 23:56:19 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-10-24 00:08:29 +02:00
|
|
|
@@ -968,6 +968,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2024-01-23 18:01:39 +01:00
|
|
|
}
|
|
|
|
|
2024-10-24 00:08:29 +02:00
|
|
|
public void move(MoverType type, Vec3 movement) {
|
2024-01-23 18:01:39 +01:00
|
|
|
+ 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 {
|
2024-10-24 00:08:29 +02:00
|
|
|
@@ -1059,7 +1060,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2022-12-27 23:56:19 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!bl.getType().isAir()) {
|
|
|
|
- VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl);
|
2024-01-23 18:01:39 +01:00
|
|
|
+ VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl, org.bukkit.craftbukkit.util.CraftVector.toBukkit(originalMovement)); // Paper - Expose pre-collision velocity
|
2022-12-27 23:56:19 +01:00
|
|
|
this.level.getCraftServer().getPluginManager().callEvent(event);
|
|
|
|
}
|
|
|
|
}
|