mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-13 19:11:43 +01:00
Ensure entity isn't destroyed when trying to show it. Fixes BUKKIT-2038
If two players (or a player and any other entity) are teleported to the same location in the same tick they will both get added to the other's destroy queue then have a new entity spawn packet sent. Next tick the destroy queue will be processed and they will then be invisible to each other. To prevent this situation we remove the entity from the destroy queue when sending out a spawn packet for them. By: Travis Watkins <amaranth@ubuntu.com>
This commit is contained in:
parent
515032c89a
commit
e29c5d9725
@ -631,7 +631,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
EntityTracker tracker = ((WorldServer) entity.world).tracker;
|
||||
EntityPlayer other = ((CraftPlayer) player).getHandle();
|
||||
EntityTrackerEntry entry = (EntityTrackerEntry) tracker.trackedEntities.get(other.id);
|
||||
getHandle().g.remove(Integer.valueOf(other.id)); // Should be called destroyQueue
|
||||
if (entry != null && !entry.trackedPlayers.contains(getHandle())) {
|
||||
entry.updatePlayer(getHandle());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user