2021-06-14 08:41:01 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 21 Jul 2018 08:25:40 -0400
|
|
|
|
Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
2024-04-24 04:46:06 +02:00
|
|
|
index 46da628073e2bfb77b3deab623dba46228d92618..1c508d1f122d287cd8dc0a905de96436c343327a 100644
|
2021-06-14 08:41:01 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
2024-04-24 04:46:06 +02:00
|
|
|
@@ -1441,6 +1441,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
2021-06-14 08:41:01 +02:00
|
|
|
} else {
|
|
|
|
ChunkMap.TrackedEntity playerchunkmap_entitytracker = new ChunkMap.TrackedEntity(entity, i, j, entitytypes.trackDeltas());
|
|
|
|
|
|
|
|
+ entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
|
|
|
|
this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
|
|
|
|
playerchunkmap_entitytracker.updatePlayers(this.level.players());
|
|
|
|
if (entity instanceof ServerPlayer) {
|
2024-04-24 04:46:06 +02:00
|
|
|
@@ -1481,7 +1482,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
2021-06-14 08:41:01 +02:00
|
|
|
if (playerchunkmap_entitytracker1 != null) {
|
|
|
|
playerchunkmap_entitytracker1.broadcastRemoved();
|
|
|
|
}
|
|
|
|
-
|
|
|
|
+ entity.tracker = null; // Paper - We're no longer tracked
|
|
|
|
}
|
|
|
|
|
|
|
|
protected void tick() {
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2024-04-28 00:50:33 +02:00
|
|
|
index 6f2e316480c4cd1ffb32e8d01009a18c2234c731..42dd9ab70c07e92258da70ad29b51c7780401a5d 100644
|
2021-06-14 08:41:01 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2024-04-28 00:50:33 +02:00
|
|
|
@@ -1203,6 +1203,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
2021-06-14 08:41:01 +02:00
|
|
|
// CraftBukkit start
|
2021-11-23 16:04:41 +01:00
|
|
|
private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
|
2021-06-14 08:41:01 +02:00
|
|
|
org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
|
2024-01-21 17:39:05 +01:00
|
|
|
+ // Paper start - extra debug info
|
2021-06-14 08:41:01 +02:00
|
|
|
+ if (entity.valid) {
|
2024-01-21 17:39:05 +01:00
|
|
|
+ MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
|
2021-06-14 08:41:01 +02:00
|
|
|
+ return true;
|
|
|
|
+ }
|
2024-01-21 17:39:05 +01:00
|
|
|
+ // Paper end - extra debug info
|
2021-06-14 08:41:01 +02:00
|
|
|
if (entity.isRemoved()) {
|
2021-11-23 16:04:41 +01:00
|
|
|
// WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
|
2021-06-14 08:41:01 +02:00
|
|
|
return false;
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-06-13 17:45:43 +02:00
|
|
|
index 465c3e0596853d2182e7d85734d31e1121eb71fe..1f28f466aab3d829fe719878faee40f35320163b 100644
|
2021-06-14 08:41:01 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-05-26 21:51:15 +02:00
|
|
|
@@ -244,6 +244,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
|
|
|
2021-06-14 08:41:01 +02:00
|
|
|
private CraftEntity bukkitEntity;
|
|
|
|
|
2021-12-13 05:31:32 +01:00
|
|
|
+ public @org.jetbrains.annotations.Nullable net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper
|
2021-06-14 08:41:01 +02:00
|
|
|
public CraftEntity getBukkitEntity() {
|
|
|
|
if (this.bukkitEntity == null) {
|
|
|
|
this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this);
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
|
2024-04-12 21:14:06 +02:00
|
|
|
index 38df704dca30ef08f4d0831dc1cc48c6d6f71a4d..ed6aea7a38ef6e80c300ff9b012dcdbc390ad2c7 100644
|
2021-06-14 08:41:01 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
|
2024-04-12 21:14:06 +02:00
|
|
|
@@ -33,6 +33,14 @@ public class EntityLookup<T extends EntityAccess> {
|
2021-06-14 08:41:01 +02:00
|
|
|
UUID uUID = entity.getUUID();
|
|
|
|
if (this.byUuid.containsKey(uUID)) {
|
|
|
|
LOGGER.warn("Duplicate entity UUID {}: {}", uUID, entity);
|
|
|
|
+ // Paper start - extra debug info
|
2024-01-21 17:39:05 +01:00
|
|
|
+ if (entity instanceof net.minecraft.world.entity.Entity) {
|
|
|
|
+ final T old = this.byUuid.get(entity.getUUID());
|
|
|
|
+ if (old instanceof net.minecraft.world.entity.Entity oldCast && oldCast.getId() != entity.getId() && oldCast.valid) {
|
|
|
|
+ LOGGER.error("Overwrote an existing entity {} with {}", oldCast, entity);
|
2021-06-14 08:41:01 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-21 17:39:05 +01:00
|
|
|
+ // Paper end - extra debug info
|
2021-06-14 08:41:01 +02:00
|
|
|
} else {
|
|
|
|
this.byUuid.put(uUID, entity);
|
|
|
|
this.byId.put(entity.getId(), entity);
|