core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0307-Properly-remove-entiti...

52 lines
2.3 KiB
Diff
Raw Normal View History

Only use stored chunk ref if it matches current chunk registration Closes #1197 While this really undoes a lot of the desired performance gains avoiding chunk lookups, we sadly have to accept this because we are seeing lots of bugs with entities.
2018-07-09 02:39:46 +00:00
From 24da81e684f7d7c01c3b5e6053899d60668157c1 Mon Sep 17 00:00:00 2001
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.
2018-06-11 00:09:56 +00:00
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
Only use stored chunk ref if it matches current chunk registration Closes #1197 While this really undoes a lot of the desired performance gains avoiding chunk lookups, we sadly have to accept this because we are seeing lots of bugs with entities.
2018-07-09 02:39:46 +00:00
index 9f2db9025..a96cdcbc6 100644
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.
2018-06-11 00:09:56 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Only use stored chunk ref if it matches current chunk registration Closes #1197 While this really undoes a lot of the desired performance gains avoiding chunk lookups, we sadly have to accept this because we are seeing lots of bugs with entities.
2018-07-09 02:39:46 +00:00
@@ -2430,7 +2430,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
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.
2018-06-11 00:09:56 +00:00
}
// 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 49019d54d..9fe5c4406 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1205,6 +1205,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
}
protected void c(Entity entity) {
+ if (!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());
--
Fix issues with getBlockState(false) not loading Tile Entity data This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
2018-06-30 05:40:52 +00:00
2.18.0
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.
2018-06-11 00:09:56 +00:00