Update Paper

gradle.properties

@@ -3,6 +3,6 @@ version=1.20.6-R0.1-SNAPSHOT
 
 mcVersion=1.20.6
 org.gradle.jvmargs=-Xmx2G
-paperRef=0513374b1f3410c2dd630f169a0cdf64a349500e
-preVersion=true
+paperRef=bd5867a96f792f0eb32c1d249bb4bbc1d8338d14
+preVersion=false
 updatingMinecraft=true

patches/api/0001-Leaves-Server-Config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 49d2547fcdaf779e284f513e58c1ac2ae3000bda..28ae66ae562dc7ab999908fe2a01a083a8d3de2b 100644
+index 0614bd7e2d658172a7765925adf81b75b5620f11..4304649def2a4e00058e98e7b12b799f6e261325 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2256,6 +2256,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0003-Add-fakeplayer-api.patch

@@ -14,7 +14,7 @@ index 97e78e27ee0eea2c8b24886eeb19164d552323fe..9764fa643039f215627c20a33ca70c9e
  /.factorypath
 +
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9a219b255b63f10005fc68faacb771dd32f61ac2..6dcec4061e2bec84b23cc7e5fbd2927b1571b77e 100644
+index 47039514503d99e84cb99f4941707a7726286516..345dbebf7a291d43f6f6ceccfba0184af86da531 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2909,6 +2909,17 @@ public final class Bukkit {
@@ -36,7 +36,7 @@ index 9a219b255b63f10005fc68faacb771dd32f61ac2..6dcec4061e2bec84b23cc7e5fbd2927b
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 28ae66ae562dc7ab999908fe2a01a083a8d3de2b..f549901dfde495282390479337a1d13b62461295 100644
+index 4304649def2a4e00058e98e7b12b799f6e261325..1300fb43cf20f9400eb337d3104158383951eae8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -61,6 +61,7 @@ import org.bukkit.util.CachedServerIcon;

patches/api/0008-Force-peaceful-mode-switch.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Force peaceful mode switch
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 97f97ea5c6aa513c439f86a9c82821e0f7d9cd1e..14d0e02673a37cd991c5c8cd34dd45b7cadde53a 100644
+index 26622cafbb9811fafe18d5dd9b25f56960154772..260704ce884e7549279d8744524b18993661b6fa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -4317,6 +4317,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

patches/api/0009-Replay-Mod-API.patch

@@ -14,7 +14,7 @@ index 9764fa643039f215627c20a33ca70c9e36b2d599..97e78e27ee0eea2c8b24886eeb19164d
  /.factorypath
 -
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6dcec4061e2bec84b23cc7e5fbd2927b1571b77e..336b8d396f067cface060354c45e03c71ca35f27 100644
+index 345dbebf7a291d43f6f6ceccfba0184af86da531..f633ddbc5041d93333f3db0cb675deb47d423224 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2919,6 +2919,11 @@ public final class Bukkit {
@@ -30,7 +30,7 @@ index 6dcec4061e2bec84b23cc7e5fbd2927b1571b77e..336b8d396f067cface060354c45e03c7
      @NotNull
      public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f549901dfde495282390479337a1d13b62461295..9384d1d8015aeae910756f35fa27bdc16dfb5662 100644
+index 1300fb43cf20f9400eb337d3104158383951eae8..98ca0f656ea3a5be30ad49bc7fb22c886adbef03 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -62,6 +62,7 @@ import org.jetbrains.annotations.Contract;

patches/api/0010-Bytebuf-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bytebuf API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 336b8d396f067cface060354c45e03c71ca35f27..900156f8a6c749177de5fc305a76b8d77c23b90e 100644
+index f633ddbc5041d93333f3db0cb675deb47d423224..992db8d11b6cb230488c0e77ce8f4834932bbded 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2925,6 +2925,12 @@ public final class Bukkit {
@@ -22,7 +22,7 @@ index 336b8d396f067cface060354c45e03c71ca35f27..900156f8a6c749177de5fc305a76b8d7
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9384d1d8015aeae910756f35fa27bdc16dfb5662..42cb311cbc6001e3116a4e2a0b4207d385995b2e 100644
+index 98ca0f656ea3a5be30ad49bc7fb22c886adbef03..79ad3c362e5437b28e44270a9c7b8947ce8b00d5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2568,4 +2568,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -35,7 +35,7 @@ index 9384d1d8015aeae910756f35fa27bdc16dfb5662..42cb311cbc6001e3116a4e2a0b4207d3
 +    // Leaves end - Bytebuf API
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6c327a07bf8a6aa11a2d7dad12b2830acc539484..e3e4bed888133422bd879479793a01eadbdef85e 100644
+index f2e1b98880503a9933a20ebcf0ba91413c859a08..ee8bcc5b50bff84b18abed6f5e82c55899367827 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3802,6 +3802,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/server/0105-Replay-Mod-API.patch

@@ -18,7 +18,7 @@ index 7976885b902a6ce7d80f31e49448c99452eb9765..6bed90ec5effafbad4aaf82878fe2463
                              collection.add(player.getGameProfile().getName());
                          }
 diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
-index 676a1499747b071515479130875157263d3a8352..af2f95487c3d044dc4462baf981c66cf0ee6a7cf 100644
+index d78ad5eccd18d89050a486a0c40090a09683bd16..fc7b20df83cd8cb8cdd7d3c2da2bc48a6760858f 100644
 --- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
 +++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
 @@ -122,6 +122,7 @@ public class EntitySelector {

patches/server/0123-Linear-region-file-format.patch

@@ -21,28 +21,10 @@ index 28baa9a192a6fd83563b57a411e9bc905ba6b7e1..de18503a98afca9a271f81bb24cb489d
      implementation("org.ow2.asm:asm-commons:9.7")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
 diff --git a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java b/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
-index 2934f0cf0ef09c84739312b00186c2ef0019a165..f1833e1d4de1c03f81ac5263ae97e911e2a63393 100644
+index 2096e57c025858519e7c46788993b9aac1ec60e8..d4fa12ce7d2482bf00229e2ea9e25a2d7f59e0ea 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
-@@ -816,7 +816,7 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
-                                                final ChunkDataController taskController) {
-         final ChunkPos chunkPos = new ChunkPos(chunkX, chunkZ);
-         if (intendingToBlock) {
--            return taskController.computeForRegionFile(chunkX, chunkZ, true, (final RegionFile file) -> {
-+            return taskController.computeForRegionFile(chunkX, chunkZ, true, (final org.leavesmc.leaves.region.AbstractRegionFile file) -> { // Leaves
-                 if (file == null) { // null if no regionfile exists
-                     return Boolean.FALSE;
-                 }
-@@ -829,7 +829,7 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
-                 return Boolean.FALSE;
-             } // else: it either exists or is not known, fall back to checking the loaded region file
-
--            return taskController.computeForRegionFileIfLoaded(chunkX, chunkZ, (final RegionFile file) -> {
-+            return taskController.computeForRegionFileIfLoaded(chunkX, chunkZ, (final org.leavesmc.leaves.region.AbstractRegionFile file) -> { // Leaves
-                 if (file == null) { // null if not loaded
-                     // not sure at this point, let the I/O thread figure it out
-                     return Boolean.TRUE;
-@@ -1131,9 +1131,9 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
+@@ -1077,9 +1077,9 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
              return this.getCache().doesRegionFileNotExistNoIO(new ChunkPos(chunkX, chunkZ));
          }
 
@@ -54,7 +36,7 @@ index 2934f0cf0ef09c84739312b00186c2ef0019a165..f1833e1d4de1c03f81ac5263ae97e911
              synchronized (cache) {
                  try {
                      regionFile = cache.getRegionFile(new ChunkPos(chunkX, chunkZ), existingOnly, true);
-@@ -1146,19 +1146,19 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
+@@ -1092,19 +1092,19 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
                  return function.apply(regionFile);
              } finally {
                  if (regionFile != null) {
@@ -78,7 +60,7 @@ index 2934f0cf0ef09c84739312b00186c2ef0019a165..f1833e1d4de1c03f81ac5263ae97e911
                  }
              }
 
-@@ -1166,7 +1166,7 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
+@@ -1112,7 +1112,7 @@ public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
                  return function.apply(regionFile);
              } finally {
                  if (regionFile != null) {