Paper/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch

27 lines
1.3 KiB
Diff
Raw Normal View History

From 127bfea5a9352e569678cfff0289d97192b7134d Mon Sep 17 00:00:00 2001
2019-04-30 03:20:24 +02: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
index 067379252d..bac458fa54 100644
2019-04-30 03:20:24 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2019-05-14 04:20:58 +02:00
@@ -966,7 +966,8 @@ public class WorldServer extends World {
2019-04-30 03:20:24 +02: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;
}
}
--
2.21.0