From 491ddba93727b3dcf83e066b54dd33d9759adabb Mon Sep 17 00:00:00 2001 From: Aikar 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 2b8148fbda..9038d17fde 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -332,6 +332,7 @@ public class ChunkRegionLoader { NBTTagList nbttaglist2 = new NBTTagList(); NBTTagCompound nbttagcompound4; + java.util.List toUpdate = new java.util.ArrayList<>(); // Paper if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.LEVELCHUNK) { Chunk chunk = (Chunk) ichunkaccess; @@ -343,6 +344,17 @@ public class ChunkRegionLoader { while (iterator1.hasNext()) { Entity entity = (Entity) iterator1.next(); + // 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 + nbttagcompound4 = new NBTTagCompound(); if (entity.d(nbttagcompound4)) { chunk.d(true); @@ -350,6 +362,13 @@ public class ChunkRegionLoader { } } } + + // Paper start - move entities to the correct chunk + for (Entity entity : toUpdate) { + worldserver.entityJoinedWorld(entity); + } + // Paper end + } else { ProtoChunk protochunk = (ProtoChunk) ichunkaccess; -- 2.21.0