mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 05:54:43 +01:00
73983e4c16
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes:f1f33559Update to Minecraft 1.14.38a3d3f49SPIGOT-5098: Add a method to allow colored sign changes533290e2SPIGOT-5100: Console warning from pig zombie targeting6dde4b9fSPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants9af90077SPIGOT-5097: Bukkit.clearRecipes() no longer working38fa220fFix setting game rules via the APIfe3930ceUpdate to Minecraft 1.14.3-pre4da071ec5Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
From 46b21135bcded2c0f67837ada678ce4bbb866d7c 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 ad3ade3c5c..cf33965082 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
|
|
|