Paper Chunk registration fixes & Fix infinite loop when saving chunks

CobbleSword · Feb 20, 2022 · 0d70a5a · 0d70a5a
1 parent ead58d0
commit 0d70a5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NachoSpigot-Server/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/NachoSpigot-Server/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -195,6 +195,7 @@ public void b() {
                 if (this.c()) {
                     continue;
                 }
+				break; // Paper - fix infinite loop when saving chunks
             }
         } finally {
             this.e = false;

diff --git a/NachoSpigot-Server/src/main/java/net/minecraft/server/World.java b/NachoSpigot-Server/src/main/java/net/minecraft/server/World.java
@@ -1910,7 +1910,8 @@ public void entityJoinedWorld(Entity entity, boolean flag) {
             }
 
             int k = MathHelper.floor(entity.locX / 16.0D);
-            int l = MathHelper.floor(entity.locY / 16.0D);
+            //int l = MathHelper.floor(entity.locY / 16.0D);
+			int l = Math.min(15, Math.max(0, MathHelper.floor(entity.locY / 16.0D))); // Paper - stay consistent with chunk add/remove behavior
             int i1 = MathHelper.floor(entity.locZ / 16.0D);
 
             // Nacho start - deobfuscate chunkX, chunkY, chunkZ removeEntity