36 lines
1.8 KiB
Diff
36 lines
1.8 KiB
Diff
|
From 5bcdb8659896fe78904ecdd15d38ea2a483204d0 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 9fe5c4406..dd78a87b2 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
@@ -1159,7 +1159,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.a(entity)); // CraftBukkit
|
||
|
|
+ WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.a(entity)); // CraftBukkit // Paper
|
||
|
|
return false;
|
||
|
|
} else {
|
||
|
|
UUID uuid = entity.getUniqueID();
|
||
|
|
@@ -1171,7 +1171,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
||
|
|
this.f.remove(entity1);
|
||
|
|
} else {
|
||
|
|
if (!(entity instanceof EntityHuman)) {
|
||
|
|
- // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.a(entity1), uuid.toString()); // CraftBukkit
|
||
|
|
+ WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.a(entity1), uuid.toString()); // CraftBukkit // Paper
|
||
|
|
+ WorldServer.a.error("Deleting duplicate entity {}", entity); // Paper
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|