From a6bc17b8bb2e74d9e3bf91edbcd10ca0bbe76a47 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Wed, 8 Jun 2022 16:50:14 +0200
Subject: [PATCH] IT COMPILES BOIS

---
 ...253-Asynchronous-chunk-IO-and-loading.patch | 18 +++++++++++++++++-
 ...0856-Fix-World-locateNearestStructure.patch |  2 +-
 .../0861-Fix-save-problems-on-shutdown.patch   |  2 +-
 .../0868-Fix-saving-in-unloadWorld.patch       |  2 +-
 .../0884-WorldCreator-keepSpawnLoaded.patch    |  2 +-
 ...on-on-world-create-while-being-ticked.patch |  4 ++--
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch
index 59bc36d94..0d9b769d5 100644
--- a/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch
@@ -2318,7 +2318,7 @@ index 455a8d824540c66cf50b6440000b807bc1c71025..efa3c79533ac2abff8387f3bbe6e312f
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, config.get(), ops.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), services, LoggerChunkProgressListener::new);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 87970a1291b6c01bcb94a87fbbb0877a9d6b350f..2ad76722a54d4cc1a4f4799d14d0148c86e93198 100644
+index 40d086016536dd3efa5c861a770853c166974c7c..d1cf567134d702db33b9defbab0e801275e2e9f2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -953,7 +953,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2877,6 +2877,22 @@ index a6add84c2bae068263b0ae9fe4bd66c569884be5..27725c9c1ad03f8f2263c027ebf6f175
          // CraftBukkit end
          StringReader stringreader = new StringReader(packet.getCommand());
  
+diff --git a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+index 821052e93ee753db6aaf499bbf39dc30598fe72f..2955c1ee153c410ea45fe367bac8597621c9bbd0 100644
+--- a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
++++ b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+@@ -182,7 +182,11 @@ public class WorldUpgrader {
+                             }
+ 
+                             WorldUpgrader.LOGGER.error("Error upgrading chunk {}", chunkcoordintpair, throwable);
++                            // Paper start
++                        } catch (IOException e) {
++                            WorldUpgrader.LOGGER.error("Error upgrading chunk {}", chunkcoordintpair, e);
+                         }
++                        // Paper end
+ 
+                         if (flag1) {
+                             ++this.converted;
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
 index db4fa7355b1f834d0f8a0710c1c583dded184613..ab9bb440c8e91ecb49c1e14a427d35087a87ac80 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
diff --git a/patches/server/0856-Fix-World-locateNearestStructure.patch b/patches/server/0856-Fix-World-locateNearestStructure.patch
index 6add754c8..01fe5406b 100644
--- a/patches/server/0856-Fix-World-locateNearestStructure.patch
+++ b/patches/server/0856-Fix-World-locateNearestStructure.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix World#locateNearestStructure
   impl needs to be changed to reflect that
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 33953cc7afc2616577b768a23a7d4ce0230cf480..b37c8c5801b87a24cd26675c3bf4bd2c83c9ba2c 100644
+index 9e93f2b4c28550cd3d1996f0fbab430c0d1c158e..eb668dd94b288ea3dcfa1982eca109ba8e751766 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2022,6 +2022,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0861-Fix-save-problems-on-shutdown.patch b/patches/server/0861-Fix-save-problems-on-shutdown.patch
index 99ab72022..69a7376ef 100644
--- a/patches/server/0861-Fix-save-problems-on-shutdown.patch
+++ b/patches/server/0861-Fix-save-problems-on-shutdown.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] Fix save problems on shutdown
   processed so that the main process queue can be drained
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b37c8c5801b87a24cd26675c3bf4bd2c83c9ba2c..19640c290eb16c9e5afc842ec8ccac5a6a2ea4c7 100644
+index eb668dd94b288ea3dcfa1982eca109ba8e751766..7c311e4db66952e5389900160a27e9db30269f68 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -953,6 +953,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0868-Fix-saving-in-unloadWorld.patch b/patches/server/0868-Fix-saving-in-unloadWorld.patch
index b2aba7190..7dce265ca 100644
--- a/patches/server/0868-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0868-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ 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 eb3b53c40fcb4a4b975b8bf43e4c4cf636c44395..05f79097ec240d5f58b38909bc31e90727f6d6b5 100644
+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 {
diff --git a/patches/server/0884-WorldCreator-keepSpawnLoaded.patch b/patches/server/0884-WorldCreator-keepSpawnLoaded.patch
index fe56fb49c..fc1d41073 100644
--- a/patches/server/0884-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0884-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 05f79097ec240d5f58b38909bc31e90727f6d6b5..436f8faa37e5e19e053aab6739ecca33a8851527 100644
+index 4c3e17130c12765b2d693ceca4e2701c8ba08cd6..ef5f638a03515e965688e3f336ecf44fb11de64e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1238,6 +1238,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch
index 73e194601..0ae7a16bd 100644
--- a/patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 19640c290eb16c9e5afc842ec8ccac5a6a2ea4c7..74d2d8869beaabfb6c179455730df709c47c4447 100644
+index 7c311e4db66952e5389900160a27e9db30269f68..a06b1fb0eaba5ed91db4cf34240c1544662b5e97 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -35,7 +35,7 @@ index 19640c290eb16c9e5afc842ec8ccac5a6a2ea4c7..74d2d8869beaabfb6c179455730df709
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 436f8faa37e5e19e053aab6739ecca33a8851527..406f236a658b591ad7db700ad24e580da3a588ca 100644
+index ef5f638a03515e965688e3f336ecf44fb11de64e..a25222c01433170a5a536562159f1d0f80ba2fbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1129,6 +1129,7 @@ public final class CraftServer implements Server {