twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-12 18:55:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Reduce and improve dupe uuid resolve message

Browse Source
This commit is contained in:
Aikar
2018-07-23 22:50:56 -04:00
parent 64077154ff
commit 3b12d748b4
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
View File

@@ -78,7 +78,7 @@ index 14c8edeff..e3f6557e1 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 04adf4e3c..ea9559583 100644 index 04adf4e3c..b31c301ec 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -126,13 +126,11 @@ index 04adf4e3c..ea9559583 100644
+ switch (mode) { + switch (mode) {
+ case REGEN: { + case REGEN: {
+ entity.setUUID(UUID.randomUUID()); + entity.setUUID(UUID.randomUUID());
+ logger.error("Duplicate UUID found used by " + other); + logger.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", regenerated UUID for " + entity + ". See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about.");
+ logger.error("Regenerated a new UUID for " + entity);
+ break; + break;
+ } + }
+ case DELETE: { + case DELETE: {
+ logger.error("Duplicate UUID found used by " + other); + 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.");
+ logger.error("Deleting duplicate entity " + entity);
+ entity.die(); + entity.die();
+ iterator.remove(); + iterator.remove();
+ break; + break;