2018-07-19 07:13:53 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2018-08-26 20:11:49 +02:00
|
|
|
index 3b3ace52b0..6987d9423c 100644
|
2018-07-19 07:13:53 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
|
|
|
|
|
|
private boolean j(Entity entity) {
|
|
|
|
if (entity.dead) {
|
2018-07-19 07:51:01 +02:00
|
|
|
- // 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
|
2018-07-19 07:13:53 +02:00
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
UUID uuid = entity.getUniqueID();
|
|
|
|
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
2018-07-19 07:51:01 +02:00
|
|
|
this.g.remove(entity1);
|
2018-07-19 07:13:53 +02:00
|
|
|
} else {
|
|
|
|
if (!(entity instanceof EntityHuman)) {
|
2018-07-19 07:51:01 +02:00
|
|
|
- // 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
|
2018-07-19 07:13:53 +02:00
|
|
|
+ WorldServer.a.error("Deleting duplicate entity {}", entity); // Paper
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|