Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 02:10:30 +01:00
Code Issues Projects Releases Wiki Activity
faf59c3242
Paper/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch

52 lines
2.4 KiB
Diff
Raw Normal View History

Default nether void damage to off and allow that
2019-04-05 07:27:37 +02:00
From d6effb7b11bcebd1208e442c7e2da371ba3a6132 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 02:09:56 +02: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
Default nether void damage to off and allow that
2019-04-05 07:27:37 +02:00
index 1bb79a61e..97d21f65d 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 02:09:56 +02:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Default nether void damage to off and allow that
2019-04-05 07:27:37 +02:00
@@ -2611,7 +2611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
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 02:09:56 +02: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;
Updated Upstream (Bukkit/CraftBukkit/Spigot) Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this 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: b850a822 SPIGOT-4526: Add conversion time API for Zombie & subclasses CraftBukkit Changes: 38cf676e SPIGOT-4534: CreatureSpawnEvent not being called for CHUNK_GEN b446cb5d SPIGOT-4527: Fix sponges with waterlogged blocks 6ec8ea5c SPIGOT-4526: Add conversion time API for Zombie & subclasses c64fe508 Mappings Update a3c2ec03 Fix missing ServerListPingEvent call for legacy pings Spigot Changes: 1dc156ce Rebuild patches 140f654d Mappings Update
2018-12-17 06:18:06 +01:00
this.world.methodProfiler.enter("reposition");
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 02:09:56 +02:00
/* 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
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
2019-03-20 02:46:00 +01:00
index e4730352d..c08ee62e8 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 02:09:56 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
Remove redstone checks for BlockPhysicsEvent as it wasnt working, general optimize Just make it ignore the event fires when no plugin is listening to it.
2019-02-26 02:38:55 +01:00
@@ -997,6 +997,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
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 02:09:56 +02:00
}
protected void c(Entity entity) {
Guard the Entity.SHARED_RANDOM from seed changes I don't clearly see any, but as a protection for future changes.
2018-07-21 15:03:10 +02:00
+ 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
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 02:09:56 +02:00
super.c(entity);
this.entitiesById.d(entity.getId());
this.entitiesByUUID.remove(entity.getUniqueID());
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
2019-03-20 02:46:00 +01:00
2.21.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 02:09:56 +02:00
Reference in New Issue Copy Permalink