mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-17 09:25:40 +02:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
From fb17a0382199e08478fafa054ffaba06dcfce1fa 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..27278078e4 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -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
|
|
|