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

MC 1.14.1

Browse Source
This commit is contained in:
Zach Brown
2019-05-13 21:20:58 -05:00
parent d1310ddac5
commit 1ea2c3b4be
256 changed files with 762 additions and 787 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,21 +18,21 @@ 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 0fed039f34..2e9686b432 100644
index 2b8148fbd..9038d17fd 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 {
NBTTagList nbttaglist2 = new NBTTagList();
NBTTagCompound nbttagcompound4;
Iterator iterator1;
+ java.util.List<Entity> toUpdate = new java.util.ArrayList<>(); // Paper
if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.LEVELCHUNK) {
Chunk chunk = (Chunk) ichunkaccess;
@@ -0,0 +0,0 @@ public class ChunkRegionLoader {
while (iterator1.hasNext()) {
Entity entity = (Entity) iterator1.next();
while (iterator2.hasNext()) {
Entity entity = (Entity) iterator2.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.");
@@ -43,9 +43,10 @@ index 0fed039f34..2e9686b432 100644
+ continue;
+ }
+ // Paper end
+
nbttagcompound4 = new NBTTagCompound();
if (entity.d(nbttagcompound4)) {
chunk.d(true);
@@ -0,0 +0,0 @@ public class ChunkRegionLoader {
}
}
@@ -53,7 +54,7 @@ index 0fed039f34..2e9686b432 100644
+
+ // Paper start - move entities to the correct chunk
+ for (Entity entity : toUpdate) {
+ ((WorldServer)world).entityJoinedWorld(entity);
+ worldserver.entityJoinedWorld(entity);
+ }
+ // Paper end
+