Updated Upstream (Gale)

Upstream has released updates that appear to apply and compile correctly

Gale Changes:
Dreeam-qwq/Gale@de9e804 Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT
 
-galeCommit = 62352a4f16b7fefd63caac2c3a31c980aad159f0
+galeCommit = de9e80495b291819a9838681291bb3af148395da
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0004-Purpur-API-Changes.patch

@@ -35,7 +35,7 @@ index 25ad7e9a9aa11049ad6ce2d2c829d3e75f8886c2..0cafbbcb8fe294bcd84b93da8fba9636
      /**
       * The brand id for Pufferfish.
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 625f4f07b493826b13304960ba81e9ff0fd93ddb..0e258af4bf9e7dca550d3498e8d57c5abf2be8c7 100644
+index 3576093460cba9b3ef2cc46b3d4d03eedba5a0f9..ebf04da015cfe394e9c5d3a3c432674df979f93c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2988,4 +2988,127 @@ public final class Bukkit {
@@ -249,10 +249,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..e98d6321c5f2cdde91b54f8a74cbcc04
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 54704da43cf9c429f3914f0580246dde99aa93c0..e1a677cfde05aba487a09e34e170fea61a125e7d 100644
+index 40820f27f1dd7d368ac710a45f6fe8d4269c004f..724e64a8ff978456c101a97432e45f234e349926 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -5622,4 +5622,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5623,4 +5623,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
          }
          return Registry.BLOCK.get(material.key);
      }
@@ -405,7 +405,7 @@ index 3993fecec5b4c2bbd77e175a168afcad571ce4d1..d0206c9c2f423a9b77237d9a005b9ee1
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2a22f20f25f46766cd8bc69a640898f4b051fc68..55ebeb1a107f660754536c48539ac7b2b51a8ec9 100644
+index b1c34f4d44b420930e79dd440328e522b669601f..ab6e3eb18b9c36fdd8f56f491332085aa2ec0c37 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2318,6 +2318,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1108,7 +1108,7 @@ index 7fbfdb07585c7b28acea1f0c1f58ada0cc744441..21fcca092e2e31baa5ece0de9e44e3fa
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 444744ea6f5921b0ae229995f8b15ea9d980c402..508bb3493e74a42ce8abf57bba05c08a715849dc 100644
+index db5c7434a7e529727b556f314d5cd8e0534114fe..ec8a9225a45dd95b07b1d5d2f4eaf889178fc112 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -375,4 +375,14 @@ public interface Villager extends AbstractVillager {

patches/server/0001-Rebrand.patch

@@ -188,10 +188,10 @@ index bdfb969f88e68d89a5cad4b145bbc1441a110bac..fba0558f46516f65c678635359f305f8
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 394588a2ec825807bcf2d1383586a25f941dd774..62b7870072338ebc5adc62a1793136491d0288f5 100644
+index 138e062d18d85702f4af8ac896ec26b10951fa5d..4f65503d9989530bd34734d27d30699df93c24cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -487,7 +487,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -483,7 +483,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
 
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

patches/server/0011-Purpur-Server-Changes.patch

@@ -1755,7 +1755,7 @@ index 1d11d0388b9763a0e0e5f3398425dafa2bb01488..72cf1372a7e685b3ff4cc852c3d38f7d
                      }
                  } catch (AuthenticationUnavailableException authenticationunavailableexception) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f86d2644024f4b190e9bded08aa9b71d6d0c8235..0bba03116d4746515117574177abfc7b43326a43 100644
+index 84aa1341ad32e2060036a816b3e59dc0253814e4..5bf0ddcf797e8e1ddaff31841e574089159b6928 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -494,6 +494,7 @@ public abstract class PlayerList {
@@ -1783,7 +1783,7 @@ index f86d2644024f4b190e9bded08aa9b71d6d0c8235..0bba03116d4746515117574177abfc7b
                  event.disallow(PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
              }
          }
-@@ -1082,6 +1084,20 @@ public abstract class PlayerList {
+@@ -1083,6 +1085,20 @@ public abstract class PlayerList {
      }
      // CraftBukkit end
 
@@ -1804,15 +1804,15 @@ index f86d2644024f4b190e9bded08aa9b71d6d0c8235..0bba03116d4746515117574177abfc7b
      public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
          Iterator iterator = this.players.iterator();
 
-@@ -1185,6 +1201,7 @@ public abstract class PlayerList {
+@@ -1186,6 +1202,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + permissionLevel);
              }
 +            if (b0 < 28 && player.getBukkitEntity().hasPermission("purpur.debug.f3n")) b0 = 28; // Purpur
 
              player.connection.send(new ClientboundEntityEventPacket(player, b0));
          }
-@@ -1193,6 +1210,27 @@ public abstract class PlayerList {
+@@ -1194,6 +1211,27 @@ public abstract class PlayerList {
          player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
          this.server.getCommands().sendCommands(player);
          } // Paper - Add sendOpLevel API
@@ -16997,7 +16997,7 @@ index ee08ee23bea25a2dd19518f84ec38fbbcda10f41..5d7280ad82c03b35ea6636d633ef411c
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f4a2086f54f183e72d9f1923b6313016a9e08d0a..12a5c16f715b5f4d7509aaf8e26491a31c2cc4ff 100644
+index 2364b9ea26121ceb3e7ac0bb591ccf3c813fa6c7..0a90a0ce80e12f3ff6e4108d4d14f87241e3e956 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2343,6 +2343,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0015-Remove-Timings.patch

@@ -838,7 +838,7 @@ index e2c24813f59c2fd075c740ac1842a38f20ed8554..1f7f68aad97ee73763c042837f239bdc
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a2541bc74821696a80c86abb3685d284f63acedb..3220e5d9a2dfd80da573047bcdab7faf6a78398e 100644
+index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059762f8603 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -187,8 +187,6 @@ import org.bukkit.craftbukkit.CraftRegistry;
@@ -1029,7 +1029,7 @@ index fac1809609d2eb2a11a943d5d636903b13d3cc27..0e6d92f450613b1c617ecf723d44d177
          // Paper start
          if (waitableArray[0] != null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index e88b5769dab436ce20f6986995a57ccd9cc42950..41ab27bdeb3cbc54f71977feda61a3034eed3e9e 100644
+index e623490b47842114f0bd1c96d806be43dc0447ca..4d91b50e527320647f6c9aa20fc5da071c3fdee0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,6 +1,5 @@
@@ -1155,7 +1155,7 @@ index e8a89db44ed4f20516a9716bc3f41658f63a312c..74bf36f75b59b1e21b72afcf65344786
          }
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fae2574cee5779c4a3ea7aec393f087676327b0e..0d4a36e59072de962363bb72babae30f792bf560 100644
+index b044de2a7af189e4ee4c8d72212fb8b7612f8a3a..20f1069230fcef4a00deec4c0ae6fdc64041630a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -1325,7 +1325,7 @@ index fae2574cee5779c4a3ea7aec393f087676327b0e..0d4a36e59072de962363bb72babae30f
 
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0bba03116d4746515117574177abfc7b43326a43..03aa00fda048a634777dfc28a8b45599ae4c4b3b 100644
+index 5bf0ddcf797e8e1ddaff31841e574089159b6928..a66c3ce90af1a3566bd5055a5dec6280b97d3df8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,6 +1,5 @@
@@ -1335,15 +1335,15 @@ index 0bba03116d4746515117574177abfc7b43326a43..03aa00fda048a634777dfc28a8b45599
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1293,7 +1292,6 @@ public abstract class PlayerList {
+@@ -1294,7 +1293,6 @@ public abstract class PlayerList {
 
      public void saveAll(int interval) {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
 -        MinecraftTimings.savePlayers.startTiming(); // Paper
          int numSaved = 0;
          long now = MinecraftServer.currentTick;
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1304,7 +1302,6 @@ public abstract class PlayerList {
+@@ -1305,7 +1303,6 @@ public abstract class PlayerList {
              }
              // Paper end - Incremental chunk and player saving
          }
@@ -1789,7 +1789,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 62b7870072338ebc5adc62a1793136491d0288f5..55433c8956e5e10cb156c8a8b572e80b3b0c14ee 100644
+index 4f65503d9989530bd34734d27d30699df93c24cc..3ecdc98b20888422b5f566e1bfe1c8cef6ea8a54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -199,9 +199,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -1803,7 +1803,7 @@ index 62b7870072338ebc5adc62a1793136491d0288f5..55433c8956e5e10cb156c8a8b572e80b
      // Paper end
 
      public static byte toLegacyData(BlockState data) {
-@@ -482,7 +480,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -478,7 +476,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
      // Paper start
      @Override
      public String getTimingsServerName() {

patches/server/0027-Slice-Smooth-Teleports.patch

@@ -19,10 +19,10 @@ index 1dc2af59bafa5a5dc6721da02cde19a3ca77af28..b2ae3fdf128e7d66e3f3430266321a6a
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 03aa00fda048a634777dfc28a8b45599ae4c4b3b..6bf9d97992b17aa985e16d9367b64bbe1b0b6dfe 100644
+index a66c3ce90af1a3566bd5055a5dec6280b97d3df8..001439f714506b734b389f345716ac2e4e4a5893 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -903,10 +903,10 @@ public abstract class PlayerList {
+@@ -904,10 +904,10 @@ public abstract class PlayerList {
          ServerLevel worldserver1 = entityplayer1.serverLevel();
          LevelData worlddata = worldserver1.getLevelData();
 

patches/server/0033-Leaves-Xaero-Map-Protocol.patch

@@ -9,10 +9,10 @@ Original project: https://github.com/LeavesMC/Leaves
 This patch is Powered by Xaero Map
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8e8346394ba5c48c551050725decbb7f6a91098a..42fa51a01c33d525d6858d53811b204280d362e6 100644
+index 0adb25590da474d4939957447f0b98e1367c5852..ec3ee8a6c14660a55dd868ca557ccffae0a94674 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1332,6 +1332,7 @@ public abstract class PlayerList {
+@@ -1333,6 +1333,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()));

patches/server/0039-Petal-Async-Pathfinding.patch

@@ -628,10 +628,10 @@ index f929b9e623eaea0e949a7af1828b9eb198fc66b8..1e31f20da2450e92228d511f060ff9f5
                      @Override
                      protected float distance(Node a, Node b) {
 diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-index c6a03d08fb90a3d5be6281cb6afd57b168e0c5c8..4f8197d1fcf48016b7482c648d53c37ed0047ca3 100644
+index 6b2c3afa04a3564e435633b521d918ed795f9f65..d9da09ac78e1b67a666539089b70a097d7236ad3 100644
 --- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-@@ -213,8 +213,15 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
+@@ -227,8 +227,15 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
 
      @Override
      protected VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {

patches/server/0061-Remove-useless-creating-stats-json-bases-on-player-n.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove useless creating stats json bases on player name logic
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 42fa51a01c33d525d6858d53811b204280d362e6..b94dfd585714ee103400221e3e6fb4d8261fa6f4 100644
+index ec3ee8a6c14660a55dd868ca557ccffae0a94674..c812130e62c3bbbb14de9b9f96bc10988f05a8e8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1536,6 +1536,8 @@ public abstract class PlayerList {
+@@ -1537,6 +1537,8 @@ public abstract class PlayerList {
              File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, String.valueOf(uuid) + ".json");
 
@@ -17,7 +17,7 @@ index 42fa51a01c33d525d6858d53811b204280d362e6..b94dfd585714ee103400221e3e6fb4d8
              if (!file1.exists()) {
                  File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
-@@ -1544,6 +1546,8 @@ public abstract class PlayerList {
+@@ -1545,6 +1547,8 @@ public abstract class PlayerList {
                      file2.renameTo(file1);
                  }
              }

patches/server/0066-Mirai-Configurable-chat-message-signatures.patch

@@ -117,10 +117,10 @@ index ae0d0310d50f1ada082e045a58a24a43f8079da8..eea19f895588c51bce86f20b3ec505fd
          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 8ce41d394a2e60ec2c9411f4a3172a63edd15b12..3482c172685990f696797a954ef765fe2d0f6261 100644
+index d29afe0ebcb4a6b087945826fcef85f93f607763..86534a2a58b823af64e51e14be197e02636871c6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1490,7 +1490,7 @@ public abstract class PlayerList {
+@@ -1491,7 +1491,7 @@ public abstract class PlayerList {
          // Paper end
          boolean flag = this.verifyChatTrusted(message);
 
@@ -129,7 +129,7 @@ index 8ce41d394a2e60ec2c9411f4a3172a63edd15b12..3482c172685990f696797a954ef765fe
          OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message);
          boolean flag1 = false;
 
-@@ -1519,6 +1519,7 @@ public abstract class PlayerList {
+@@ -1520,6 +1520,7 @@ public abstract class PlayerList {
      }
 
      public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public

patches/server/0077-Configurable-connection-message.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection message
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3482c172685990f696797a954ef765fe2d0f6261..9d2faacd5c9c6e5439c6b8b2e2f7cb2bab4ad8f8 100644
+index 86534a2a58b823af64e51e14be197e02636871c6..88fc2f757c506e161badb4b9f09372eb8a7fe3ac 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -354,7 +354,7 @@ public abstract class PlayerList {
@@ -35,7 +35,7 @@ index 3482c172685990f696797a954ef765fe2d0f6261..9d2faacd5c9c6e5439c6b8b2e2f7cb2b
          this.cserver.getPluginManager().callEvent(playerQuitEvent);
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
 
-@@ -1663,4 +1663,29 @@ public abstract class PlayerList {
+@@ -1664,4 +1664,29 @@ public abstract class PlayerList {
      public boolean isAllowCommandsForAllPlayers() {
          return this.allowCommandsForAllPlayers;
      }

patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch

@@ -31,10 +31,10 @@ vain. Throttling spawn attempts in suspected spawnproof chunks improves
 performance without noticeably advantaging or disadvantaging the mob farm.
 
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index f1b74f7b12fc7b35815886501937725b65f8a8e3..4c32d5b9db0579e597039121a329057f4b760089 100644
+index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..3b5fedf1beff02b8cb7f056b512735e078864c48 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -190,6 +190,15 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -189,6 +189,15 @@ public class WorldConfiguration extends ConfigurationPart {
              @MergeMap
              public Reference2IntMap<MobCategory> ticksPerSpawn = Util.make(new Reference2IntOpenHashMap<>(NaturalSpawner.SPAWNING_CATEGORIES.length), map -> Arrays.stream(NaturalSpawner.SPAWNING_CATEGORIES).forEach(mobCategory -> map.put(mobCategory, -1)));