From 25621957f1563c480242a04bc425c160516a9ce0 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 19 May 2019 20:48:54 +0100 Subject: [PATCH] Don't run death logic on dupe entity removals --- ...-fixup-Duplicate-UUID-Resolve-Option.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Spigot-Server-Patches/0396-fixup-Duplicate-UUID-Resolve-Option.patch diff --git a/Spigot-Server-Patches/0396-fixup-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0396-fixup-Duplicate-UUID-Resolve-Option.patch new file mode 100644 index 0000000000..536fb2fafa --- /dev/null +++ b/Spigot-Server-Patches/0396-fixup-Duplicate-UUID-Resolve-Option.patch @@ -0,0 +1,31 @@ +From cfe63d9feba2cdcc85e82090d86529f9e869db9b Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Sun, 19 May 2019 20:46:35 +0100 +Subject: [PATCH] fixup! Duplicate UUID Resolve Option + + +diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java +index 292fa782d..31fe5f5e6 100644 +--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java ++++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java +@@ -524,7 +524,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { + && entity.getBukkitEntity().getLocation().distance(other.getBukkitEntity().getLocation()) < world.paperConfig.duplicateUUIDDeleteRange + ) { + if (World.DEBUG_ENTITIES) LOGGER.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", deleted entity " + entity + " because it was near the duplicate and likely an actual duplicate. See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about."); +- entity.die(); ++ entity.dead = true; + iterator.remove(); + continue; + } +@@ -537,7 +537,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { + } + case DELETE: { + if (World.DEBUG_ENTITIES) LOGGER.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", deleted entity " + entity + ". See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about."); +- entity.die(); ++ entity.dead = true; + iterator.remove(); + break; + } +-- +2.21.0 +