mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
0f2ea04c1c
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 Bukkit Changes: af58d316 Fix javadoc warning in Firework.setShotAtAngle CraftBukkit Changes:e2dd6555SPIGOT-5372: Re-add tile entity fixer due to MC-1639451e7a197fFix incorrect inequality in683bae0670db98d54dSPIGOT-5362: Suspicious stews fail isSimilar check Spigot Changes: 56f84710 Rebuild patches
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
From 65273b49cfa0d43498b5dd362069fbdd3f52b684 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 ef4ce57cc..b00247fb4 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -1010,7 +1010,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.23.0
|
|
|