2023-11-19 02:05:34 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: booky10 <boooky10@gmail.com>
|
|
|
|
|
Date: Sun, 12 Nov 2023 05:09:47 +0100
|
|
|
|
|
Subject: [PATCH] Fix missing event call for entity teleport API
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.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 7cd929d4b9ab60a585c2316b949fce2a0e97e467..2b1f3e27ce5cecc94297c27debe5e3bd64c08967 100644
|
2023-11-19 02:05:34 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2024-10-24 12:11:32 +02:00
|
|
|
@@ -259,6 +259,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2023-11-19 02:05:34 +01:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // Paper start - fix teleport event not being called
|
|
|
|
|
+ org.bukkit.event.entity.EntityTeleportEvent event = new org.bukkit.event.entity.EntityTeleportEvent(
|
|
|
|
|
+ this, this.getLocation(), location);
|
|
|
|
|
+ // cancelling the event is handled differently for players and entities,
|
|
|
|
|
+ // entities just stop teleporting, players will still teleport to the "from" location of the event
|
2023-12-26 20:22:41 +01:00
|
|
|
+ if (!event.callEvent() || event.getTo() == null) {
|
2023-11-19 02:05:34 +01:00
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ location = event.getTo();
|
|
|
|
|
+ // Paper end
|
|
|
|
|
+
|
|
|
|
|
// If this entity is riding another entity, we must dismount before teleporting.
|
|
|
|
|
if (dismount) this.entity.stopRiding(); // Paper - Teleport passenger API
|
|
|
|
|
|
