Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
f17519338b
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: masmc05 <masmc05@gmail.com>
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 2f73ca283f2d6e6bc5265c95ef767b3f606a3d69..4d7454e5a64fc18e63793a221daa94617f17c666 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
|