From 3ef991110831646661c86dc94db1b800b5ec96d3 Mon Sep 17 00:00:00 2001 From: granny Date: Thu, 27 Apr 2023 23:12:18 -0700 Subject: [PATCH] save https://github.com/PaperMC/Paper/pull/9149 from paper pr queue hell --- ...Fix-exact-choice-recipe-book-clicks.patch} | 2 +- ...erPR-9149-Flush-region-files-on-save.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) rename patches/server/{0272-PaperPR-Fix-exact-choice-recipe-book-clicks.patch => 0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch} (98%) create mode 100644 patches/server/0309-PaperPR-9149-Flush-region-files-on-save.patch diff --git a/patches/server/0272-PaperPR-Fix-exact-choice-recipe-book-clicks.patch b/patches/server/0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch similarity index 98% rename from patches/server/0272-PaperPR-Fix-exact-choice-recipe-book-clicks.patch rename to patches/server/0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch index 46b4d4c1c..da8d7845d 100644 --- a/patches/server/0272-PaperPR-Fix-exact-choice-recipe-book-clicks.patch +++ b/patches/server/0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 14 May 2022 15:42:34 -0700 -Subject: [PATCH] PaperPR Fix exact choice recipe book clicks +Subject: [PATCH] PaperPR #7822 Fix exact choice recipe book clicks diff --git a/src/main/java/net/minecraft/world/entity/player/StackedContents.java b/src/main/java/net/minecraft/world/entity/player/StackedContents.java diff --git a/patches/server/0309-PaperPR-9149-Flush-region-files-on-save.patch b/patches/server/0309-PaperPR-9149-Flush-region-files-on-save.patch new file mode 100644 index 000000000..836a831e4 --- /dev/null +++ b/patches/server/0309-PaperPR-9149-Flush-region-files-on-save.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: RednedEpic +Date: Thu, 27 Apr 2023 23:09:13 -0700 +Subject: [PATCH] PaperPR #9149 Flush region files on save + + +diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java +index 830d863cd9665d58875bfa5ca2bcd22f89ab2d49..51018f8b7176c72231fc0d0c23878659ab5c1b5b 100644 +--- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java ++++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java +@@ -257,6 +257,11 @@ public final class ChunkHolderManager { + } + if (flush) { + RegionFileIOThread.flush(); ++ try { ++ this.world.chunkSource.chunkMap.regionFileCache.flush(); ++ } catch (IOException ex) { ++ LOGGER.error("Exception when flushing regions in world {}", this.world.getWorld().getName(), ex); ++ } + } + if (logProgress) { + LOGGER.info("Saved " + savedChunk + " block chunks, " + savedEntity + " entity chunks, " + savedPoi + " poi chunks in world '" + this.world.getWorld().getName() + "' in " + format.format(1.0E-9 * (System.nanoTime() - start)) + "s");