2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-04-30 01:20:24 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Thu, 19 Jul 2018 01:08:05 -0400
|
|
|
|
Subject: [PATCH] Re-add vanilla entity warnings for duplicates
|
|
|
|
|
|
|
|
These are a critical sign that somethin went wrong, and you've lost some data....
|
|
|
|
|
|
|
|
We should kind of know about these things you know.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-06-26 06:29:44 +00:00
|
|
|
index 8a42f9ed3e1579b8b034de9321e5545505298d6b..c37b69b1632a72e3c7df5fd2643c0b3ff517d06b 100644
|
2019-04-30 01:20:24 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-06-26 06:29:44 +00:00
|
|
|
@@ -957,7 +957,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
2019-04-30 01:20:24 +00:00
|
|
|
if (entity1 == null) {
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
- // WorldServer.LOGGER.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit
|
|
|
|
+ WorldServer.LOGGER.error("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit // paper
|
|
|
|
+ WorldServer.LOGGER.error("Deleting duplicate entity {}", entity); // CraftBukkit // paper
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|