mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-30 07:19:58 +01:00
b62dfa0bf9
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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
36 lines
1.8 KiB
Diff
36 lines
1.8 KiB
Diff
From 6a67fa1b1d88393b696722bcc806fb6c8c0feeb3 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 b939c31b23..b76b8dbf5d 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -974,7 +974,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
|
|
private boolean j(Entity entity) {
|
|
if (entity.dead) {
|
|
- // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.P())); // CraftBukkit
|
|
+ WorldServer.a.warn("Tried to add entity {} but it was marked as removed already: " + entity); // CraftBukkit // Paper
|
|
return false;
|
|
} else {
|
|
UUID uuid = entity.getUniqueID();
|
|
@@ -986,7 +986,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
this.g.remove(entity1);
|
|
} else {
|
|
if (!(entity instanceof EntityHuman)) {
|
|
- // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit
|
|
+ WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit // Paper
|
|
+ WorldServer.a.error("Deleting duplicate entity {}", entity); // Paper
|
|
return false;
|
|
}
|
|
|
|
--
|
|
2.19.0
|
|
|