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
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index 7e7a78ebbf128f7d29cf9eb349f25230c9c7d5d0..f88c1becd08e7b10f228624160b85f89a379fbeb 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
|
2024-10-23 23:35:21 +02:00
|
|
|
@@ -157,7 +157,15 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
2022-10-22 19:09:45 +02:00
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean canCollideWith(Entity other) {
|
2024-10-23 23:35:21 +02:00
|
|
|
- return AbstractBoat.canVehicleCollide(this, other);
|
2024-01-16 12:41:40 +01:00
|
|
|
+ // Paper start - fix VehicleEntityCollisionEvent not called when colliding with player
|
2024-10-23 23:35:21 +02:00
|
|
|
+ boolean collides = AbstractBoat.canVehicleCollide(this, other);
|
2022-10-22 19:09:45 +02:00
|
|
|
+ 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
|
