Remove bad server.scheduleOnMain disconnect calls from old patches

The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point

1 files changed, 20 insertions, 0 deletions

diff --git a/patches/server/0685-Fix-saving-in-unloadWorld.patch b/patches/server/0685-Fix-saving-in-unloadWorld.patch
new file mode 100644
index 0000000000..6148bbda3c
--- /dev/null
+++ b/patches/server/0685-Fix-saving-in-unloadWorld.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Philip Kelley <[email protected]>
+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 958d790d48861871784607a8042e9cf4eaf51d5e..52e90dda0b0b2ac476db540243972519ade022f7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1372,7 +1372,7 @@ public final class CraftServer implements Server {
+ 
+         try {
+             if (save) {
+-                handle.save(null, true, true);
++                handle.save(null, true, false); // Paper - Fix saving in unloadWorld
+             }
+ 
+             handle.getChunkSource().close(save);