Update Paper

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
-    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
+    id("com.github.johnrengelman.shadow") version "8.1.0" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.1"
+    id("io.papermc.paperweight.patcher") version "1.5.2"
 }
 
 repositories {

gradle.properties

@@ -4,4 +4,4 @@ version=1.19.3-R0.1-SNAPSHOT
 mcVersion=1.19.3
 packageVersion=1_19_R2
 org.gradle.jvmargs=-Xmx2G
-paperRef=81d7ff6e317cee83c971baf7b10046be90a6891b
+paperRef=541753be2513fcb3bdd0e60065b9cb61286b2bf2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

patches/server/0004-Leaves-Server-Config-And-Command.patch

@@ -19,7 +19,7 @@ index 06bff37e4c1fddd3be6343049a66787c63fb420c..15ed5a9af5583e2430804662e3b9fa95
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fd59a24743099e0599609bdb4d9b4578cd4c3940..cab8412d5183427b02c5f5d7b76aded8e9fbc491 100644
+index 7a9c81f9f0db2f2aeb615cbb6e3b58233f30c6af..abc70f9aa1dd2080d9c0111a91f6dd74bc3ffbd0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1120,6 +1120,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -45,7 +45,7 @@ index a7e133f3495e9132a5fdae2c24f225e7b026295a..cd0f05aa0f2720d450ee1b975648e73d
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 3cbf801b2e5420c0e870f73788deb550e49ad54d..856055eeac058290b9b2146a11f5faccd1873df0 100644
+index db971ca4136c7f922d630f38aa5c78cb04adbdfa..5efece112550148d04f641249bee3221c6375c93 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -65,10 +65,10 @@ index 3cbf801b2e5420c0e870f73788deb550e49ad54d..856055eeac058290b9b2146a11f5facc
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 173d1921a3b8fa5d61ed67a382ea35f358be578b..b3f75263ed6c2b31e63ef97896ad297790442de7 100644
+index f758f1349e07989481be2957b519063b094ac200..ba4a1f12c29cb28441ae316ff5e1f23358e6af02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -962,6 +962,7 @@ public final class CraftServer implements Server {
+@@ -961,6 +961,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -76,7 +76,7 @@ index 173d1921a3b8fa5d61ed67a382ea35f358be578b..b3f75263ed6c2b31e63ef97896ad2977
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -977,6 +978,7 @@ public final class CraftServer implements Server {
+@@ -976,6 +977,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -84,7 +84,7 @@ index 173d1921a3b8fa5d61ed67a382ea35f358be578b..b3f75263ed6c2b31e63ef97896ad2977
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -992,6 +994,7 @@ public final class CraftServer implements Server {
+@@ -991,6 +993,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -92,7 +92,7 @@ index 173d1921a3b8fa5d61ed67a382ea35f358be578b..b3f75263ed6c2b31e63ef97896ad2977
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2746,6 +2749,14 @@ public final class CraftServer implements Server {
+@@ -2745,6 +2748,14 @@ public final class CraftServer implements Server {
          {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }

patches/server/0006-Fix-trading-with-the-void.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 54c2b7fba83d6f06dba95b1bb5b487a02048d6e6..dc0353bdbf6203167a7654609d13220cd6c0e713 100644
+index e84c67f02bce4c2f9c4eeca1b888d53377fb20d7..9d265ae4d2bb3a269c89ca76bf979400f30630a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2597,11 +2597,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2598,11 +2598,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

patches/server/0009-Fakeplayer-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fakeplayer support
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cab8412d5183427b02c5f5d7b76aded8e9fbc491..811e52d1dada0858348c162e80aec630da3283a7 100644
+index abc70f9aa1dd2080d9c0111a91f6dd74bc3ffbd0..7e15411afc2c35feb32569e557100b92b46a2b31 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -125,6 +125,7 @@ import net.minecraft.util.profiling.metrics.profiling.ServerMetricsSamplersProvi
@@ -61,7 +61,7 @@ index a0c19503aabab5378d672a30163d35a5ba05b6c1..8873e12cbd3d6f9071efedb35ea3c69c
          AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
          boolean flag1 = advancementprogress.isDone();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9160725f031c9698a00229c3dfa19d39b4a826c1..5cc41baf24eed6a186620fe3bcd76410ffc11d26 100644
+index 289429eb464548acc80262a49444f49f8f57fc0c..2e5871d9af67ad1c65a382f5e4964a13a7821305 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -176,6 +176,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
@@ -87,7 +87,7 @@ index 9160725f031c9698a00229c3dfa19d39b4a826c1..5cc41baf24eed6a186620fe3bcd76410
                  PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
                  this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..5a5a3f84138b2f9a55f0a7c17004194dd324ebb4 100644
+index 835e439a1af327c67558653ef79ef7e59692a976..d5014c1145dc25647d328835f7c93309adf8dd1a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -80,6 +80,7 @@ import net.minecraft.server.ServerScoreboard;
@@ -133,7 +133,7 @@ index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..5a5a3f84138b2f9a55f0a7c17004194d
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
          if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
-@@ -1063,11 +1076,16 @@ public abstract class PlayerList {
+@@ -1065,11 +1078,16 @@ public abstract class PlayerList {
      }
  
      public String[] getPlayerNamesArray() {
@@ -151,7 +151,7 @@ index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..5a5a3f84138b2f9a55f0a7c17004194d
  
          return astring;
      }
-@@ -1532,4 +1550,16 @@ public abstract class PlayerList {
+@@ -1534,4 +1552,16 @@ public abstract class PlayerList {
      public boolean isAllowCheatsForAllPlayers() {
          return this.allowCheatsForAllPlayers;
      }
@@ -195,7 +195,7 @@ index 15fb5ee374b19366ebb23181896fb943e95819f0..07886228e5a9536908b8480e8bf585bb
      private int timeUntilHooked;
      private float fishAngle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 78f53ee557276de85f0431ebcb146445b1f4fb92..42a2e411fd769bf0bf034141297e890c20d39b51 100644
+index 750ac80eed6ba03e138dd4c03f57ddfe4a123276..f285a5a3f8a6b793452f872bc53b4aeeb5c3d383 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -190,6 +190,8 @@ import org.bukkit.plugin.Plugin;

patches/server/0017-No-chat-sign.patch

@@ -138,7 +138,7 @@ index 6e0a3086da142f1c42007a16bbec7edbab17da04..776be7f58746f96fe9bf7daf11053d39
          }
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 811e52d1dada0858348c162e80aec630da3283a7..a3b545dd722f912a64a0d0dc92525f0f0f86b7ea 100644
+index 7e15411afc2c35feb32569e557100b92b46a2b31..e854fbca1a90679bb4f03c38fa1cb9f1622eacbb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1113,6 +1113,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -163,7 +163,7 @@ index cd0f05aa0f2720d450ee1b975648e73dc22ac9a5..90d284192f27a69f6694544c885c3e4d
  
      protected boolean convertOldUsers() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9b0b42add71172bd154226e51d62cebd8de3542e..b29b82faea67b025e35b990a64003b4b7c3aeffd 100644
+index d9c29725e015cb4684ff2d547352505d2ad8a2fe..bc2dba4a2efe56b0ca2e6c2a8881fe5d036e4166 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2140,10 +2140,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -195,10 +195,10 @@ index 9b0b42add71172bd154226e51d62cebd8de3542e..b29b82faea67b025e35b990a64003b4b
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5a5a3f84138b2f9a55f0a7c17004194dd324ebb4..04885ae3016559e2f1cb6359ad8b558e19c3595a 100644
+index d5014c1145dc25647d328835f7c93309adf8dd1a..a057f6fa87f76707cdef2615d5d49e32fc181740 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1425,7 +1425,7 @@ public abstract class PlayerList {
+@@ -1427,7 +1427,7 @@ public abstract class PlayerList {
      }
  
      public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
@@ -208,7 +208,7 @@ index 5a5a3f84138b2f9a55f0a7c17004194dd324ebb4..04885ae3016559e2f1cb6359ad8b558e
  
      // CraftBukkit start
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 5965ca2990caa88876be9b7a2400b24bd760193d..6c7538da9728c1cadf77986666d228fb5581c5e3 100644
+index c9ad5425161ad383cc6a41eff69c325e74e56973..14922eba73516e59ea99d02e632d1ba4f5ea901e 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -109,6 +109,7 @@ public final class LeavesConfig {

patches/server/0022-Optimize-entity-coordinate-key.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize entity coordinate key
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index d1a59c2af0557a816c094983ec60097fb4de060c..25e77520f269e25492d14d498f51c16b5c0c3c2d 100644
+index 6efb8b10f17c70b05128039376d254e6beda3841..abbb75af4ffad5b82d8b785b4a747b06ef372f4d 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -209,7 +209,13 @@ public final class MCUtil {
+@@ -210,7 +210,13 @@ public final class MCUtil {
      }
  
      public static long getCoordinateKey(final Entity entity) {
@@ -38,7 +38,7 @@ index 43873929f11e373186190b3ae831dc68bfa69616..2433315c13e2da90f4f208d180d487c9
      private Vec3 deltaMovement;
      private float yRot;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 384b89c86af39e9b1abd71936d6c3e69698050fc..fbf828219bf9712e3baff1196cf9bfc85de58d4e 100644
+index f5df3de5f9257ac239c454a5105b88fb639ff1e0..4447d3bef45c71e9899ea6cf13d50904e315544f 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -258,6 +258,12 @@ public final class LeavesConfig {

patches/server/0031-Config-to-disable-method-profiler.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9c8d1043e7c23f1c61c48364d7266e1f8b568262..253a80121043d124dd1c1f2bbf1418d6d3a2e10b 100644
+index 159cb3cf059730d0e74863671f9a59efabdb3d2a..49d3483357981e2a980a6e39e1be27e118adde87 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2250,6 +2250,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2249,6 +2249,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -22,10 +22,10 @@ index 9c8d1043e7c23f1c61c48364d7266e1f8b568262..253a80121043d124dd1c1f2bbf1418d6
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7d6fe65dc64afa00ecef0d1be2e13507086ab81a..dda31b5eea92ce3de9de0e4054ee9c7f6df631e4 100644
+index de84dbe7e079fe9776ef7a8c21c12487fcd736ba..f22d1a2a8a1dbb1b2294dfcaddcac24b10d905ae 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1545,6 +1545,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1547,6 +1547,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public ProfilerFiller getProfiler() {
@@ -38,7 +38,7 @@ index 7d6fe65dc64afa00ecef0d1be2e13507086ab81a..dda31b5eea92ce3de9de0e4054ee9c7f
      }
  
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index c651fea47720c49af4ff3f4af192c878b98c2453..636944381a41af0416efd821d5cfc20cb6bfdac9 100644
+index fb96902ed270c522e875edee637e78e30d2a6ace..2e9eb5850df2e6977894d8c06054288e967d24f1 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -302,6 +302,11 @@ public final class LeavesConfig {

patches/server/0045-PCA-sync-protocol.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b29b82faea67b025e35b990a64003b4b7c3aeffd..5cf311a6cbb3f831b7158f5464ef49878d9d9520 100644
+index bc2dba4a2efe56b0ca2e6c2a8881fe5d036e4166..2e762d02bc3f5d768e08a41f281b504ceb8d6996 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -241,6 +241,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -35,7 +35,7 @@ index b29b82faea67b025e35b990a64003b4b7c3aeffd..5cf311a6cbb3f831b7158f5464ef4987
                  byte[] data = new byte[packet.data.readableBytes()];
                  packet.data.readBytes(data);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ea6b6536688607a42ba6d22a646ad1daa12fb32f..bb0c658a7e701ae1d8c72b14a9807822b175b4ea 100644
+index a057f6fa87f76707cdef2615d5d49e32fc181740..70493b62ad4a7722b8823d8bdc3443d3367ac959 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -334,6 +334,7 @@ public abstract class PlayerList {
@@ -343,10 +343,10 @@ index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..25a9c38c60d183bb65b14f4d7550ab98
      public int[] getSlotsForFace(Direction side) {
          return ShulkerBoxBlockEntity.SLOTS;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b3f75263ed6c2b31e63ef97896ad297790442de7..e1ed4bbc77d24254242c9c246bf89daa6ed3c303 100644
+index ba4a1f12c29cb28441ae316ff5e1f23358e6af02..8e9fb3731edc302ae472599f8e2d953d485a265e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -387,6 +387,7 @@ public final class CraftServer implements Server {
+@@ -386,6 +386,7 @@ public final class CraftServer implements Server {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -354,7 +354,7 @@ index b3f75263ed6c2b31e63ef97896ad297790442de7..e1ed4bbc77d24254242c9c246bf89daa
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -963,6 +964,13 @@ public final class CraftServer implements Server {
+@@ -962,6 +963,13 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
  		top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config

patches/server/0046-BBOR-Protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] BBOR Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 253a80121043d124dd1c1f2bbf1418d6d3a2e10b..325bca7d156eac56f80a4551d21dc9875bef7ed7 100644
+index 49d3483357981e2a980a6e39e1be27e118adde87..64ac23a34285328cf79550d31c7a4bbb55138de1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1585,6 +1585,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 253a80121043d124dd1c1f2bbf1418d6d3a2e10b..325bca7d156eac56f80a4551d21dc987
          for (int i = 0; i < this.tickables.size(); ++i) {
              ((Runnable) this.tickables.get(i)).run();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5cf311a6cbb3f831b7158f5464ef49878d9d9520..09156a91883f76f22c0be90e5cc0037706bb9f5a 100644
+index 2e762d02bc3f5d768e08a41f281b504ceb8d6996..d81d6697fd1524d73df631b76c39cf363e1c33ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3557,6 +3557,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -32,7 +32,7 @@ index 5cf311a6cbb3f831b7158f5464ef49878d9d9520..09156a91883f76f22c0be90e5cc00377
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bb0c658a7e701ae1d8c72b14a9807822b175b4ea..a902043b198a70b24fd44fbabe2252ba01269284 100644
+index 70493b62ad4a7722b8823d8bdc3443d3367ac959..50833a1db2728131b6638a40236b81a219ed5f53 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -335,6 +335,7 @@ public abstract class PlayerList {
@@ -51,7 +51,7 @@ index bb0c658a7e701ae1d8c72b14a9807822b175b4ea..a902043b198a70b24fd44fbabe2252ba
          // Paper end
          ServerLevel worldserver = entityplayer.getLevel();
  
-@@ -1545,7 +1547,7 @@ public abstract class PlayerList {
+@@ -1547,7 +1549,7 @@ public abstract class PlayerList {
              entityplayer.connection.send(packetplayoutrecipeupdate);
              entityplayer.getRecipeBook().sendInitialRecipeBook(entityplayer);
          }
@@ -77,10 +77,10 @@ index 1bf1af06fbd6501e98def7997c487c425d6a1623..15f9978e9c1ccb7f64a5f43c564842f9
  
      public Level getLevel() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e1ed4bbc77d24254242c9c246bf89daa6ed3c303..bf1c8fb01267e86feb0053821f625686c1a2c37d 100644
+index 8e9fb3731edc302ae472599f8e2d953d485a265e..0f639571f63adad7d2a738b7ce8dc0158cdeb0c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -971,6 +971,13 @@ public final class CraftServer implements Server {
+@@ -970,6 +970,13 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal();
          }
          // Leaves end - pca

patches/server/0049-Jade-Protocol.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Jade Protocol
 This patch is Powered by Jade(https://github.com/Snownee/Jade)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 09156a91883f76f22c0be90e5cc0037706bb9f5a..94a9af6f7b01677609a372371c77f11e462c7e6e 100644
+index d81d6697fd1524d73df631b76c39cf363e1c33ec..53279da009fb9f203d7e8006cb1ef14d9ef8c017 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3560,6 +3560,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -20,7 +20,7 @@ index 09156a91883f76f22c0be90e5cc0037706bb9f5a..94a9af6f7b01677609a372371c77f11e
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a902043b198a70b24fd44fbabe2252ba01269284..0e36692732b88bd021425403c1f765149e97c263 100644
+index 50833a1db2728131b6638a40236b81a219ed5f53..aaa48a93550b6ad7bf5c904491e5d34d4b7dcceb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -336,6 +336,7 @@ public abstract class PlayerList {
@@ -45,10 +45,10 @@ index 9058f9f2e561cda9f475f33218bf7a78297de4bc..196adc124a06e7c7712e4f70fada6d50
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bf1c8fb01267e86feb0053821f625686c1a2c37d..69fc3ef5cb4b30fbd1633bc67ff0491023aaa9de 100644
+index 0f639571f63adad7d2a738b7ce8dc0158cdeb0c6..9db4ac8fb3e00e6b37d55c5c6bac9557bae105ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -388,6 +388,7 @@ public final class CraftServer implements Server {
+@@ -387,6 +387,7 @@ public final class CraftServer implements Server {
          }
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
          top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca
@@ -56,7 +56,7 @@ index bf1c8fb01267e86feb0053821f625686c1a2c37d..69fc3ef5cb4b30fbd1633bc67ff04910
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -978,6 +979,11 @@ public final class CraftServer implements Server {
+@@ -977,6 +978,11 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.BBORProtocol.loggedOutAllPlayer();
          }
          // Leaves end - bbor

patches/server/0056-Return-nether-portal-fix.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
 This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b1d5e07d68a8203450a6b4c28ec863cb90017586..7764e261fde9374ecaa62d14966f44e6d753a449 100644
+index 128a79504e2459826dbc32b5889f66bf00ea4189..0f13a91c9614bd8381cc5db60fb8f2ad8b7d191c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -177,6 +177,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -74,7 +74,7 @@ index b1d5e07d68a8203450a6b4c28ec863cb90017586..7764e261fde9374ecaa62d14966f44e6
              return optional;
          } else {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6f991cab06ef7049fc0db02e6998d513e78b993d..d7a21346ecfe4d7a7e4df14346659826bdbc07b1 100644
+index aaa48a93550b6ad7bf5c904491e5d34d4b7dcceb..6c2a0393147b14f155401d5298ca183c252c169e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -27,6 +27,8 @@ import java.util.UUID;
@@ -94,7 +94,7 @@ index 6f991cab06ef7049fc0db02e6998d513e78b993d..d7a21346ecfe4d7a7e4df14346659826
  // CraftBukkit end
  
  public abstract class PlayerList {
-@@ -957,6 +960,24 @@ public abstract class PlayerList {
+@@ -959,6 +962,24 @@ public abstract class PlayerList {
          if (fromWorld != location.getWorld()) {
              PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(entityplayer.getBukkitEntity(), fromWorld);
              server.server.getPluginManager().callEvent(event);
@@ -133,7 +133,7 @@ index 7647b8bb3117d005dd616b29e7310f8328973b7f..eaeac639924098b86da57e2a87efc2af
      @Nullable
      private DamageSource lastDamageSource;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 9ed9b6925dffb57839a70d6ed89a1f1fc49a186a..53a4ac574285af1f770deb79e90c669256d3abea 100644
+index 054f6479dff7e4bcef2e2f3d47e65c009d5ec5b9..478e906cc24a83ded6fbc78bcb7efae30a99b525 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -482,6 +482,11 @@ public final class LeavesConfig {

patches/server/0057-Appleskin-Protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Appleskin Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 325bca7d156eac56f80a4551d21dc9875bef7ed7..ed1620016aa949e77c0b004f76a10676caa78249 100644
+index 64ac23a34285328cf79550d31c7a4bbb55138de1..9c435373df254daecba83f4bde34dfab1cbf7a38 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1586,6 +1586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index 325bca7d156eac56f80a4551d21dc9875bef7ed7..ed1620016aa949e77c0b004f76a10676
          MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
          for (int i = 0; i < this.tickables.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 56cbd8aa1157ac0d4756e1b8f97c3185d63fa9ed..f4d65a391e012aaf37988018b5136c4d385bfc50 100644
+index 6c2a0393147b14f155401d5298ca183c252c169e..9f48801f3dbd33816f6771be8d444e7ca748aaad 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -340,6 +340,7 @@ public abstract class PlayerList {
@@ -37,10 +37,10 @@ index 56cbd8aa1157ac0d4756e1b8f97c3185d63fa9ed..f4d65a391e012aaf37988018b5136c4d
          ServerLevel worldserver = entityplayer.getLevel();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 69fc3ef5cb4b30fbd1633bc67ff0491023aaa9de..4d03f51c04af2c23705c47b3e756bfce0411b3ac 100644
+index 9db4ac8fb3e00e6b37d55c5c6bac9557bae105ab..15a28ec04c79149dc738023b9d560adbc626e49e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -984,6 +984,13 @@ public final class CraftServer implements Server {
+@@ -983,6 +983,13 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.JadeProtocol.enableAllPlayer();
          }
          // Leaves end - Jade

patches/server/0058-Xaero-Map-Protocol.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Xaero Map Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ebf9894e216b8f30ded5134c683ad68efd9c4ccd..e485b48158d65b4d47da83226f3a4ebe66dd78c3 100644
+index 9f48801f3dbd33816f6771be8d444e7ca748aaad..be05f7f218475a3eaa69d2bea1efb2abb017507d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1269,6 +1269,7 @@ public abstract class PlayerList {
+@@ -1271,6 +1271,7 @@ public abstract class PlayerList {
          player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
          player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
          player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));
@@ -17,7 +17,7 @@ index ebf9894e216b8f30ded5134c683ad68efd9c4ccd..e485b48158d65b4d47da83226f3a4ebe
              // CraftBukkit start - handle player weather
              // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 07a72eeda3d6cd8fc2aef2f34619989de2267233..3d7db0a8955c312b69338310ccec437e3046bb9e 100644
+index 25a711517d4ffdc9384c1160af1b4e9635b85f49..2808792b8fa1ed3b7f2c6f9b81e804a7bc1a6f59 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -20,6 +20,7 @@ import java.lang.reflect.Modifier;