dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
28 Zeilen
1.4 KiB
Diff
28 Zeilen
1.4 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] fix 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 2bd3ba073843b1680eeb81f7dede5973bb4f446d..f403fc311a974558233028663dbe14c27b27d3f9 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
@@ -165,7 +165,15 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
|
|
|
@Override
|
|
public boolean canCollideWith(Entity other) {
|
|
- return Boat.canVehicleCollide(this, other);
|
|
+ // Paper start - fix 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 - fix VehicleEntityCollisionEvent not called when colliding with player
|
|
}
|
|
|
|
@Override
|