Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
f4e3b4e439
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: 5b680f0b Note maximum objective score length in documentation CraftBukkit Changes:5932f8a7Load default world spawn areas in consistent order3a5dc78fFix confusing migration message appearing on fresh server516a408fRemove redundant CraftBukkit change for secondary world data73a2c749Process conversation input on the main thread.100c3f07Cap Objective Score Length6e842759Cross World Entity Teleportation7deba1c6Check for blank OfflinePlayer Namesf2746a5eDescriptive kick reasons instead of Nope!b0212308Cap Channel Registrationsa610dcd8Identify CraftScheduler threads with useful names Spigot Changes: 19c3c5a5 Rebuild patches
27 Zeilen
1.3 KiB
Diff
27 Zeilen
1.3 KiB
Diff
From cb8325e11e171ac89a60cac088300ac085687172 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 a30b8e2cb..ac8c7e6c4 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -964,7 +964,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.20.1
|
|
|