mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-13 07:28:19 +02:00
b62dfa0bf9
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
From c1ad42c1320658298476c0e0e18d7a43a9d8d3e1 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 10 Jun 2018 20:04:42 -0400
|
|
Subject: [PATCH] Properly remove entities on dimension teleport
|
|
|
|
To teleport an entity between dimensions, the server makes a copy
|
|
and puts the copy in the new location, and marks the old one dead.
|
|
|
|
If this method got called for the same world in the same tick,
|
|
the entity would not have been removed from the UUID map, and the
|
|
world readd would fail.
|
|
|
|
This can be triggered even with a plugin if the entity is teleported
|
|
twice in the same tick, from world A to B, then back from B to A.
|
|
|
|
The re-add to A will fail to add the entity to the world. It will
|
|
actually be there, but it will not be visible on the client until
|
|
the server is restarted to re-try the add to world process again.
|
|
|
|
This bug was unlikely to be seen by many due to the double teleport
|
|
requirement, but plugins (such as my own) use this method to
|
|
trigger a "reload" of the entity on the client.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index 8660387623..347aef07d5 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -2594,7 +2594,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
}
|
|
// CraftBukkit end */
|
|
|
|
- this.world.kill(this);
|
|
+ this.world.removeEntity(this); // Paper - Fully remove entity, can't have dupes in the UUID map
|
|
this.dead = false;
|
|
this.world.methodProfiler.a("reposition");
|
|
/* CraftBukkit start - Handled in calculateTarget
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index ee06457653..b939c31b23 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -1020,6 +1020,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
}
|
|
|
|
protected void c(Entity entity) {
|
|
+ if (!this.entitiesByUUID.containsKey(entity.getUniqueID()) && !entity.valid) return; // Paper - Already removed, dont fire twice - this looks like it can happen even without our changes
|
|
super.c(entity);
|
|
this.entitiesById.d(entity.getId());
|
|
this.entitiesByUUID.remove(entity.getUniqueID());
|
|
--
|
|
2.19.0
|
|
|