mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 12:11:47 +01:00
6a7fef0e4a
* Allow entity effect modification off the main thread for worldgen * squash all async catcher patches
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: lukas81298 <lukas81298@gmail.com>
|
|
Date: Tue, 12 Jan 2021 14:41:38 +0100
|
|
Subject: [PATCH] fixed entity vehicle collision event not called
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
index 46c893fd33fdaf76d49af407112ff349e9579a12..9a80cf593bbdd7681bc9395daf4545a98e07636f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
@@ -142,7 +142,15 @@ public abstract class AbstractMinecart extends Entity {
|
|
|
|
@Override
|
|
public boolean canCollideWith(Entity other) {
|
|
- return Boat.canVehicleCollide(this, other);
|
|
+ // Paper start - fixed VehicleEntityCollisionEvent not called when colliding with player
|
|
+ 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();
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|