1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-03 21:37:28 +01:00

Update upstream B/CB

This commit is contained in:
Zach Brown 2016-06-19 21:41:46 -05:00
parent 2d5bf3c88c
commit 7253bb10ca
3 changed files with 2 additions and 23 deletions

View file

@ -1,21 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jadon Fowler <jadonflower@gmail.com>
Date: Fri, 17 Jun 2016 02:26:58 -0700
Subject: [PATCH] Fix infinite loop when saving chunks
Running `/save-all flush` would start an infinite loop that prints:
ThreadedAnvilChunkStorage (world): All chunks are saved
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 implements IChunkLoader, IAsyncChunkSaver {
if (this.c()) {
continue;
}
+ break; // Paper - fix infinite loop when saving chunks
}
} finally {
this.f = false;
--

@ -1 +1 @@
Subproject commit eb9f4ee387c12e0179e32cd581575d79d2b93ec5
Subproject commit da1195392ac6db7015a83165a01b9c62b8380a24

@ -1 +1 @@
Subproject commit 9856d8a18395617ffa0ecc05dcbf9255e6a66d12
Subproject commit 9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f