mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add back fix swamp hut deadlock patch

Browse source
This commit is contained in:
Jake Potrebic 2022-06-08 07:58:51 -07:00
parent a6bc17b8bb
commit 7a165c9c5d
No known key found for this signature in database
GPG key ID: 27CC63F7CBC866C7
41 changed files with 63 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

20
patches/server/0869-Fix-saving-in-unloadWorld.patch Normal file
View file

@ -0,0 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Philip Kelley <philip@thoriumcube.org>
Date: Wed, 16 Mar 2022 12:05:59 +0000
Subject: [PATCH] Fix saving in unloadWorld
Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 55cf8b912fb9de324d10ebc49f4fa30aceceeedd..4c3e17130c12765b2d693ceca4e2701c8ba08cd6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1279,7 +1279,7 @@ public final class CraftServer implements Server {
try {
if (save) {
- handle.save(null, true, true);
+ handle.save(null, true, false); // Paper - don't disable saving
}
handle.getChunkSource().close(save);