mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-04 19:27:01 +02:00
32 lines
2.1 KiB
Diff
32 lines
2.1 KiB
Diff
From cfe63d9feba2cdcc85e82090d86529f9e869db9b Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
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
|
|
|