2022-10-22 19:09:45 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: lukas81298 <lukas81298@gmail.com>
|
|
|
|
Date: Tue, 12 Jan 2021 14:41:38 +0100
|
2024-01-16 12:41:40 +01:00
|
|
|
Subject: [PATCH] fix entity vehicle collision event not called
|
2022-10-22 19:09:45 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
2024-01-16 12:41:40 +01:00
|
|
|
index 9780232286052d2cbbd604e71caf47dfb81fc1dc..dc421a0a6430583f1f0154e1dd689b80253f6e3d 100644
|
2022-10-22 19:09:45 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
2023-12-06 17:21:56 +01:00
|
|
|
@@ -168,7 +168,15 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
2022-10-22 19:09:45 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean canCollideWith(Entity other) {
|
|
|
|
- return Boat.canVehicleCollide(this, other);
|
2024-01-16 12:41:40 +01:00
|
|
|
+ // Paper start - fix VehicleEntityCollisionEvent not called when colliding with player
|
2022-10-22 19:09:45 +02:00
|
|
|
+ boolean collides = Boat.canVehicleCollide(this, other);
|
|
|
|
+ if (!collides) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ org.bukkit.event.vehicle.VehicleEntityCollisionEvent collisionEvent = new org.bukkit.event.vehicle.VehicleEntityCollisionEvent((org.bukkit.entity.Vehicle) getBukkitEntity(), other.getBukkitEntity());
|
|
|
|
+
|
|
|
|
+ return collisionEvent.callEvent();
|
2024-01-16 12:41:40 +01:00
|
|
|
+ // Paper end - fix VehicleEntityCollisionEvent not called when colliding with player
|
2022-10-22 19:09:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|