mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
From 91043567437b4d6e6a453fd63b75599c3140146f Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 26 Jul 2018 00:11:12 -0400
|
|
Subject: [PATCH] Prevent Saving Bad entities to chunks
|
|
|
|
See https://github.com/PaperMC/Paper/issues/1223
|
|
|
|
Minecraft is saving invalid entities to the chunk files.
|
|
|
|
Avoid saving bad data, and also make improvements to handle
|
|
loading these chunks. Any invalid entity will be instant killed,
|
|
so lets avoid adding it to the world...
|
|
|
|
This lets us be safer about the dupe UUID resolver too, as now
|
|
we can ignore instant killed entities and avoid risk of duplicating
|
|
an invalid entity.
|
|
|
|
This should reduce log occurrences of dupe uuid messages.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
index 03be77299b..e778c2e857 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
@@ -319,6 +319,7 @@ public class ChunkRegionLoader {
|
|
nbttagcompound1.set("TileEntities", nbttaglist1);
|
|
NBTTagList nbttaglist2 = new NBTTagList();
|
|
|
|
+ java.util.List<Entity> toUpdate = new java.util.ArrayList<>(); // Paper
|
|
if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.LEVELCHUNK) {
|
|
Chunk chunk = (Chunk) ichunkaccess;
|
|
|
|
@@ -330,13 +331,29 @@ public class ChunkRegionLoader {
|
|
while (iterator1.hasNext()) {
|
|
Entity entity = (Entity) iterator1.next();
|
|
NBTTagCompound nbttagcompound3 = new NBTTagCompound();
|
|
-
|
|
+ // Paper start
|
|
+ if ((int)Math.floor(entity.locX) >> 4 != chunk.getPos().x || (int)Math.floor(entity.locZ) >> 4 != chunk.getPos().z) {
|
|
+ LogManager.getLogger().warn(entity + " is not in this chunk, skipping save. This a bug fix to a vanilla bug. Do not report this to PaperMC please.");
|
|
+ toUpdate.add(entity);
|
|
+ continue;
|
|
+ }
|
|
+ if (entity.dead) {
|
|
+ continue;
|
|
+ }
|
|
+ // Paper end
|
|
if (entity.d(nbttagcompound3)) {
|
|
chunk.d(true);
|
|
nbttaglist2.add(nbttagcompound3);
|
|
}
|
|
}
|
|
}
|
|
+
|
|
+ // Paper start - move entities to the correct chunk
|
|
+ for (Entity entity : toUpdate) {
|
|
+ worldserver.entityJoinedWorld(entity);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
} else {
|
|
ProtoChunk protochunk = (ProtoChunk) ichunkaccess;
|
|
|
|
--
|
|
2.22.0
|
|
|