SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.14.2

Browse Source
This commit is contained in:
Spottedleaf
2019-05-27 16:01:45 -07:00
parent 4d1f9bd463
commit 9f4fe93a9a
78 changed files with 371 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch
View File

@@ -18,12 +18,12 @@ 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 2b8148fbd..9038d17fd 100644
index 1ebb16f0f6..2f749fe26a 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -0,0 +0,0 @@ public class ChunkRegionLoader {
nbttagcompound1.set("TileEntities", nbttaglist1);
NBTTagList nbttaglist2 = new NBTTagList();
NBTTagCompound nbttagcompound4;
+ java.util.List<Entity> toUpdate = new java.util.ArrayList<>(); // Paper
if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.LEVELCHUNK) {
@@ -32,7 +32,8 @@ index 2b8148fbd..9038d17fd 100644
@@ -0,0 +0,0 @@ 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.");
@@ -43,11 +44,9 @@ index 2b8148fbd..9038d17fd 100644
+ continue;
+ }
+ // Paper end
+
nbttagcompound4 = new NBTTagCompound();
if (entity.d(nbttagcompound4)) {
if (entity.d(nbttagcompound3)) {
chunk.d(true);
@@ -0,0 +0,0 @@ public class ChunkRegionLoader {
nbttaglist2.add(nbttagcompound3);
}
}
}