05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
From 8f7833aafc25460c7d84db690eeeeed35cf0d662 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 a97e024ec4..bd52bf6561 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
@@ -561,11 +561,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
|
|
|
Iterator iterator;
|
|
|
|
+ java.util.List<Entity> toUpdate = new java.util.ArrayList<>(); // Paper
|
|
for (int j = 0; j < chunk.getEntitySlices().length; ++j) {
|
|
iterator = chunk.getEntitySlices()[j].iterator();
|
|
|
|
while (iterator.hasNext()) {
|
|
Entity entity = (Entity) iterator.next();
|
|
+ // Paper start
|
|
+ if ((int)Math.floor(entity.locX) >> 4 != chunk.locX || (int)Math.floor(entity.locZ) >> 4 != chunk.locZ) {
|
|
+ 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
|
|
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
|
|
|
|
if (entity.d(nbttagcompound1)) {
|
|
@@ -574,6 +585,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
|
}
|
|
}
|
|
}
|
|
+ // Paper start - move entities to the correct chunk
|
|
+ for (Entity entity : toUpdate) {
|
|
+ world.entityJoinedWorld(entity, false);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
nbttagcompound.set("Entities", nbttaglist1);
|
|
NBTTagList nbttaglist2 = new NBTTagList();
|
|
--
|
|
2.18.0
|
|
|