2021-12-22 01:40:24 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
|
Date: Sat, 4 Dec 2021 17:04:47 -0800
|
|
|
|
|
Subject: [PATCH] Forward CraftEntity in teleport command
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.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 f7bd4f1e101330a8ac29cc8059a2f4263c382bfc..568e968af99cc97de5c32b432f8c1be9790b0bcd 100644
|
2021-12-22 01:40:24 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-11-04 18:42:38 +01:00
|
|
|
@@ -3481,6 +3481,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2021-12-22 01:40:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void restoreFrom(Entity original) {
|
2024-01-18 22:00:40 +01:00
|
|
|
+ // Paper start - Forward CraftEntity in teleport command
|
2021-12-22 01:40:24 +01:00
|
|
|
+ CraftEntity bukkitEntity = original.bukkitEntity;
|
|
|
|
|
+ if (bukkitEntity != null) {
|
|
|
|
|
+ bukkitEntity.setHandle(this);
|
|
|
|
|
+ this.bukkitEntity = bukkitEntity;
|
|
|
|
|
+ }
|
2024-01-18 22:00:40 +01:00
|
|
|
+ // Paper end - Forward CraftEntity in teleport command
|
2021-12-22 01:40:24 +01:00
|
|
|
CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
|
|
|
|
|
|
|
|
|
|
nbttagcompound.remove("Dimension");
|
2024-11-04 18:42:38 +01:00
|
|
|
@@ -3618,8 +3625,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2024-10-23 22:10:14 +02:00
|
|
|
entity.restoreFrom(this);
|
|
|
|
|
this.removeAfterChangingDimensions();
|
|
|
|
|
// CraftBukkit start - Forward the CraftEntity to the new entity
|
|
|
|
|
- this.getBukkitEntity().setHandle(entity);
|
|
|
|
|
- entity.bukkitEntity = this.getBukkitEntity();
|
|
|
|
|
+ //this.getBukkitEntity().setHandle(entity);
|
|
|
|
|
+ //entity.bukkitEntity = this.getBukkitEntity(); // Paper - forward CraftEntity in teleport command; moved to Entity#restoreFrom
|
|
|
|
|
// CraftBukkit end
|
|
|
|
|
entity.teleportSetPosition(PositionMoveRotation.of(teleportTarget), teleportTarget.relatives());
|
|
|
|
|
if (this.inWorld) world.addDuringTeleport(entity); // CraftBukkit - Don't spawn the new entity if the current entity isn't spawned
|
