2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
27 Zeilen
1.3 KiB
Diff
27 Zeilen
1.3 KiB
Diff
From af71e8f923576c61e1fd1b70fa6da337937311e9 Mon Sep 17 00:00:00 2001
|
|
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 139168291a..8cffbabfb6 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -966,7 +966,8 @@ public class WorldServer extends World {
|
|
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
|
|
|