Updated Upstream (Paper/Gale/Purpur)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@d1a72ea Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11405) PaperMC/Paper@0a53f1d Set default drop behavior for player deaths (#11380) PaperMC/Paper@951e7dd Fix TrialSpawner forgetting assigned mob when placed by player (#11381) PaperMC/Paper@13a2395 Fix enable-player-collisions playing sounds when set to false (#11390) PaperMC/Paper@1348e44 Prevent NPE when serializing unresolved profile (#11407) Gale Changes: Dreeam-qwq/Gale@f346681 Updated Upstream (Paper) Dreeam-qwq/Gale@bba1737 Updated Upstream (Paper) Purpur Changes: PurpurMC/Purpur@88352c3 Updated Upstream (Paper) PurpurMC/Purpur@dee41bc Updated Upstream (Paper) PurpurMC/Purpur@fdfc12e Updated Upstream (Paper) PurpurMC/Purpur@bc7bcbb Fix elytra durability setting not working properly (#1589) PurpurMC/Purpur@8af4ea6 Updated Upstream (Paper) PurpurMC/Purpur@8332fa4 Updated Upstream (Paper)
2025-12-24 01:19:25 +00:00 · 2024-09-17 01:38:58 -04:00
parent 0fd4eb732f
commit 337a94cda9
18 changed files with 124 additions and 111 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT

-galeCommit = a8d8e691820bc6b79694e7bcfd0d7d665fd271d4
+galeCommit = bba17376ceb9d9d84882c57efdf62aaf49eb0767

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0004-Purpur-API-Changes.patch
+++ b/patches/api/0004-Purpur-API-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur

-Commit: 0a9941ee397c7d49fd9a2a1f4aaa78bb0907bd01
+Commit: 8332fa45d9886aed8cf0c114e08c6671a06794c8

 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -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 40820f27f1dd7d368ac710a45f6fe8d4269c004f..724e64a8ff978456c101a97432e45f234e349926 100644
+index de469f32dd9a01e0e2fde016044a783dde0c5b98..c7fa497381c5c5d57fda8b9c1ef26f2e89523f66 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -5623,4 +5623,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5625,4 +5625,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
         }
         return Registry.BLOCK.get(material.key);
     }
@@ -905,10 +905,10 @@ index bcc6ba95bd21c7972865838c636a03f50b6c1f1a..c3fcd8dd7dbb1e1a18e17c014c1e6411
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index fcdc5fce88720cc926a3953d80b5045113d1516c..5afdebfdf74d4c428a58045db2190dded7f68307 100644
+index 68c08e7a212bc3e3885f9b5a4d9aef85fcb3b029..a22909446b7193b1de121bdd6d7b6fbf81dc3be4 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1458,4 +1458,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1468,4 +1468,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      */
     boolean canUseEquipmentSlot(org.bukkit.inventory.@NotNull EquipmentSlot slot);
     // Paper end - Expose canUseSlot
@@ -1208,18 +1208,18 @@ index 8fdfcbc7d20fe0af6b220ab94516247093637621..f6a8928408e11a5ae723366e4ea1280d
          * When a player gets bad omen after killing a patrol captain.
          *
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 398f74ba0d2e890fb556cd964f61da7c623a7c6d..29090acd16d8f5a41c8653d0e68692f0e07e3bf1 100644
+index 7184f80899206bedeac387e9f8a35482801efd4b..e4197c89c04b91732ce96981f8df0a0bdaee24ce 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -162,7 +162,7 @@ public enum InventoryType {
-     SMITHING_NEW(4, "Upgrade Gear"),
+@@ -164,7 +164,7 @@ public enum InventoryType {
+     SMITHING_NEW(4, "Upgrade Gear", MenuType.SMITHING),
     ;
 
 -    private final int size;
 +    private int size; public void setDefaultSize(int size) { this.size = size; } // Purpur - remove final and add setter
     private final String title;
+     private final MenuType menuType;
     private final boolean isCreatable;
- 
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
 index f1f97a85ec713c05c882d7588f4a3e4a017f4795..813f6cd253322538bdf96eb323dd23a7809a1c1e 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
--- a/patches/generated-api/0001-Purpur-generated-api-Changes.patch
+++ b/patches/generated-api/0001-Purpur-generated-api-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur

-Commit: 0a9941ee397c7d49fd9a2a1f4aaa78bb0907bd01
+Commit: 8332fa45d9886aed8cf0c114e08c6671a06794c8

 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 02411466bdcf4ff731f01ccebb2c99942e0db878..2718c0e5061838b01881bb231c53f4da348adce3 100644
--- a/patches/server/0011-Purpur-Server-Changes.patch
+++ b/patches/server/0011-Purpur-Server-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur

-Commit: 0a9941ee397c7d49fd9a2a1f4aaa78bb0907bd01
+Commit: 8332fa45d9886aed8cf0c114e08c6671a06794c8

 Patches below are removed in this patch:
 Pufferfish-Server-Changes.patch
@@ -32,7 +32,7 @@ Make-pufferfish-config-relocatable.patch
 MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 86c54bdbe9db0c2b11c78a0323a33344614131ba..6434e3d96af137bf398fff66225dfcda79f513db 100644
+index 9783e7800d060d0daab25b37b86cbbd811e02f65..102a4f8e0cb05eeffac116c98c5b25db02e6b245 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -54,6 +54,12 @@ dependencies {
@@ -1472,10 +1472,10 @@ index ee9e4521079137d7b72194e8789810e7a89b8e75..28731f0c5b0ba63fa8d5ce3ee580bf31
 +    // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index a720a05c47b2137a07515461960603cc5c939d16..b66fdb789fcb460d63fd81540112d655c9a0c3f2 100644
+index 8847873e5fc1fdf272d3acb84289a54efaa62b64..51c8d265f6c40b872efd7e03dccd162a52edff09 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -87,6 +87,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -92,6 +92,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
     private static final long KEEPALIVE_LIMIT = KEEPALIVE_LIMIT_IN_SECONDS * 1000;
     // Gale end - Purpur - send multiple keep-alive packets
     protected static final ResourceLocation MINECRAFT_BRAND = ResourceLocation.withDefaultNamespace("brand"); // Paper - Brand support
@@ -1483,7 +1483,7 @@ index a720a05c47b2137a07515461960603cc5c939d16..b66fdb789fcb460d63fd81540112d655
 
     public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit
         this.server = minecraftserver;
-@@ -190,6 +191,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -195,6 +196,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
                 this.disconnect(Component.literal("Invalid payload REGISTER!"), PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
             }
@@ -1742,10 +1742,10 @@ index 1816eea82d60e4433541a90c83825529301c6818..bde6f388ab0076114b8d81cc344fc88b
                             if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                 entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1d11d0388b9763a0e0e5f3398425dafa2bb01488..72cf1372a7e685b3ff4cc852c3d38f7d4f8fc5ad 100644
+index 4e4f14ba35a1a5944c605dfd1784047d43e559ce..fac4130957d35609ea9d281866f95f360fce3b35 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -331,7 +331,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -336,7 +336,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
                         ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!");
                         ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(s1)); // Spigot
                     } else {
@@ -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 84aa1341ad32e2060036a816b3e59dc0253814e4..5bf0ddcf797e8e1ddaff31841e574089159b6928 100644
+index 871f16983a6497a5e592eb9c76a24499280de8a1..f93ef54bbb02d0749a42aeebf8425472804cd213 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 84aa1341ad32e2060036a816b3e59dc0253814e4..5bf0ddcf797e8e1ddaff31841e574089
                 event.disallow(PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
             }
         }
-@@ -1083,6 +1085,20 @@ public abstract class PlayerList {
+@@ -1088,6 +1090,20 @@ public abstract class PlayerList {
     }
     // CraftBukkit end
 
@@ -1804,7 +1804,7 @@ index 84aa1341ad32e2060036a816b3e59dc0253814e4..5bf0ddcf797e8e1ddaff31841e574089
     public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
         Iterator iterator = this.players.iterator();
 
-@@ -1186,6 +1202,7 @@ public abstract class PlayerList {
+@@ -1191,6 +1207,7 @@ public abstract class PlayerList {
             } else {
                 b0 = (byte) (24 + permissionLevel);
             }
@@ -1812,7 +1812,7 @@ index 84aa1341ad32e2060036a816b3e59dc0253814e4..5bf0ddcf797e8e1ddaff31841e574089
 
             player.connection.send(new ClientboundEntityEventPacket(player, b0));
         }
-@@ -1194,6 +1211,27 @@ public abstract class PlayerList {
+@@ -1199,6 +1216,27 @@ public abstract class PlayerList {
         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
         this.server.getCommands().sendCommands(player);
         } // Paper - Add sendOpLevel API
@@ -2097,7 +2097,7 @@ index f43bf280999ff3860cc702def50cc62b131eb1bd..66d9e99a351f5fc6cf58be3bee4397d9
     }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bf7543ffcda807c3e1536019f802749d8e5b0ca0..89d5458c83f4e8ad49e36c634f67302e230fa00f 100644
+index 8d7d04483a8b7265b7c094e100c995062ef6d126..3f9c6f887763842fd25fe8e9b2352f7fd5e4b57c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -169,6 +169,7 @@ import org.bukkit.plugin.PluginManager;
@@ -2388,7 +2388,7 @@ index bf7543ffcda807c3e1536019f802749d8e5b0ca0..89d5458c83f4e8ad49e36c634f67302e
 +    // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index d8cc5614502db7025349e085381b6b32ad32296a..f1b9e83206cc67e6ef29ebe088351b0aaa5eb349 100644
+index dca7b99e97f21bf6cfae6ee69eeac95d0bcf6863..4830ebddade00f62287bcc9d7b17be83c0ad3a56 100644
 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
 +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
@@ -40,6 +40,7 @@ public final class EntitySelector {
@@ -2526,7 +2526,7 @@ index 09fdea983772612ef3fff6b2da3cf469a34e4ec0..b69d924fa8034eabbf4aab8d3434f4f4
     protected ParticleOptions getInkParticle() {
         return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f7d8b0e7c7da53ade0009fc3184528cf76014bb0..11f4f12ca2793d94ff42a176b3c8c2df297ba911 100644
+index 93fae6169e06cbb4bfbff194ccddf51a5c190d28..568d12f93954c1346210d0d031cf026453fd86c4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -236,9 +236,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2853,7 +2853,7 @@ index f7d8b0e7c7da53ade0009fc3184528cf76014bb0..11f4f12ca2793d94ff42a176b3c8c2df
                     }
 
                     this.gameEvent(GameEvent.ELYTRA_GLIDE);
-@@ -4575,6 +4694,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4578,6 +4697,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return EquipmentSlot.MAINHAND;
     }
 
@@ -12031,7 +12031,7 @@ index 37e682452ecc30646faf1ae8da47f91779619d42..f929b9e623eaea0e949a7af1828b9eb1
 
     public static void applyDarknessAround(ServerLevel world, Vec3 pos, @Nullable Entity entity, int range) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 49b35fab8ee98a384ee12d36bbe2ac813342f1d6..142bcf71448e2c54991fd144269f74c7a2e94d14 100644
+index d28ebcae036168dd65a5f3236d12ee416308c23f..1534f3953bae2cc6ef945aacdf332fceac8940e2 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
@@ -48,6 +48,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -12041,7 +12041,7 @@ index 49b35fab8ee98a384ee12d36bbe2ac813342f1d6..142bcf71448e2c54991fd144269f74c7
 +    static final net.minecraft.world.item.crafting.Ingredient TEMPT_ITEMS = net.minecraft.world.item.crafting.Ingredient.of(net.minecraft.world.level.block.Blocks.EMERALD_BLOCK.asItem()); // Purpur
 
     // CraftBukkit start
-     private CraftMerchant craftMerchant;
+     @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
 index e0e5046c84941a8d17e18c177f3daea9cb631940..d503d7a5837dbeb98e58dbe8f7e5de45f6d88990 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
@@ -12625,10 +12625,10 @@ index 8575941fd238750c5d56843989a48bcbde2d8a88..b4ed2df8d0795409808df0205edce6da
     protected double getDefaultGravity() {
         return 0.06D;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index e312002f8afc6b77d9923381169cfe498206f5a0..617043b24fbf073038ffc5252da75c4cfaf85d38 100644
+index 6f9590135dbad0d616781a87a403bd83ebfa9f78..0f143ed6b3448c8d40eb79dfe19b3d9e4e68d853 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -406,7 +406,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -403,7 +403,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
     public boolean mayInteract(Level world, BlockPos pos) {
         Entity entity = this.getOwner();
 
@@ -12827,7 +12827,7 @@ index 8c60f71270d909c10e6617eb64b8fdb42deb73e9..eedce2a3d67d875d5174ee125e267948
                     if (!raid.isStarted() && !this.raidMap.containsKey(raid.getId())) {
                         this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index f403fc311a974558233028663dbe14c27b27d3f9..337bd2011c471361653c317004f8380c9fddfc47 100644
+index a38ce400550893f63640e3bb5bb801ab40f06266..8b1c00062a5272d1020bc85491d8627c4d5f46cb 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -102,12 +102,14 @@ public abstract class AbstractMinecart extends VehicleEntity {
@@ -12921,7 +12921,7 @@ index f403fc311a974558233028663dbe14c27b27d3f9..337bd2011c471361653c317004f8380c
 
         this.move(MoverType.SELF, this.getDeltaMovement());
         if (!this.onGround()) {
-@@ -619,7 +673,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
+@@ -629,7 +683,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
             if (d18 > 0.01D) {
                 double d20 = 0.06D;
 
@@ -13881,7 +13881,7 @@ index 06497b5141e611cc7a1b6030a7b9c54b5c4eda06..28df1b3230762e52b5458ac93a85c9a5
                 return InteractionResult.PASS;
             }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 70df666abd3264f24e2f3c6480c6310e4500fdf0..2777b9379a547b29b9a300c1c549f33c1b2a7d07 100644
+index e46e7c3e919a7f12ccf135dceec911b1fec9e0f2..9b17400f29d445c0afccf9ec423143024605a200 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -497,6 +497,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -13927,7 +13927,20 @@ index 70df666abd3264f24e2f3c6480c6310e4500fdf0..2777b9379a547b29b9a300c1c549f33c
     public int getDamageValue() {
         return Mth.clamp((Integer) this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage());
     }
-@@ -1231,6 +1253,12 @@ public final class ItemStack implements DataComponentHolder {
+@@ -708,6 +730,12 @@ public final class ItemStack implements DataComponentHolder {
+                         org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(serverPlayer, this); // Paper - Add EntityDamageItemEvent
+                     }
+                     // CraftBukkit end
+                    // Purpur start
+                    if (item == Items.ELYTRA) {
+                        setDamageValue(this.getMaxDamage() - 1);
+                        return;
+                    }
+                    // Purpur end
+ 
+                     this.shrink(1);
+                     breakCallback.accept(item);
+@@ -1229,6 +1257,12 @@ public final class ItemStack implements DataComponentHolder {
         return !((ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY)).isEmpty();
     }
 
@@ -16619,7 +16632,7 @@ index 29123f3a2f211c08d1a9ccf62ca9bc9822f90111..db78616676ba021ee0f03cfea932f291
 +    // Purpur
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 9d93130f23addb18b97d7f5ec013faef17a74529..29d2fb87a65778926aea2cfc7a5b486cad596515 100644
+index 4f4e3ee18d586f61706504218cddc06a38ca5580..95cf30c1ded4a46791e1739fbae2d06c50f3be5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -335,14 +335,26 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -16857,7 +16870,7 @@ index 9d93130f23addb18b97d7f5ec013faef17a74529..29d2fb87a65778926aea2cfc7a5b486c
 +    // Purpur end - OfflinePlayer API
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ee08ee23bea25a2dd19518f84ec38fbbcda10f41..5d7280ad82c03b35ea6636d633ef411c220f9bb6 100644
+index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a38ea05b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -415,6 +415,20 @@ public final class CraftServer implements Server {
@@ -16961,7 +16974,7 @@ index ee08ee23bea25a2dd19518f84ec38fbbcda10f41..5d7280ad82c03b35ea6636d633ef411c
     @Override
     public List<Recipe> getRecipesFor(ItemStack result) {
         Preconditions.checkArgument(result != null, "ItemStack cannot be null");
-@@ -3008,6 +3074,18 @@ public final class CraftServer implements Server {
+@@ -3005,6 +3071,18 @@ public final class CraftServer implements Server {
         }
         // Gale end - Gale configuration - API
 
@@ -16980,7 +16993,7 @@ index ee08ee23bea25a2dd19518f84ec38fbbcda10f41..5d7280ad82c03b35ea6636d633ef411c
         @Override
         public void restart() {
             org.spigotmc.RestartCommand.restart();
-@@ -3290,4 +3368,15 @@ public final class CraftServer implements Server {
+@@ -3287,4 +3365,15 @@ public final class CraftServer implements Server {
     }
     // Gale end - YAPFA - last tick time - API
 
@@ -17286,10 +17299,10 @@ index cd789c235acf740ec29c30b180e7fbe1a140caa9..bec40e26e17ba6fdefb68c79e2fa7a95
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c1bad887d1340ebc7c63fda3dceff929e4a44517..69304fa6eb65dd37e74db9ad62eac0bddfdea2c1 100644
+index 7dcfb45c24d7743956be514c7d554e06aac77b3e..46856d2b7e24c5d223b7b1627ccb451749b183e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -265,6 +265,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -273,6 +273,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
     @Override
     public void recalculatePermissions() {
         this.perm.recalculatePermissions();
@@ -17376,7 +17389,7 @@ index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..5c1cda88080850314dac196dbe71ff12
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index beb6ad312028adb14053e3f019a4fcf6c9149373..a8568e16301f7fce4baea6942a02b9be94fe7ddc 100644
+index a46fbd2a5e31dd9aa7fcf0867c91ec8d28990861..775d0082a94d262ef9b4196b7b23f66404db005f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -513,7 +513,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -17388,7 +17401,7 @@ index beb6ad312028adb14053e3f019a4fcf6c9149373..a8568e16301f7fce4baea6942a02b9be
     }
     // Paper end
 
-@@ -1163,4 +1163,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1168,4 +1168,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         return this.getHandle().canUseSlot(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
     }
     // Paper end - Expose canUseSlot
@@ -17427,10 +17440,10 @@ index 351f42842b780d053cd2e5bad9ae299449141b10..4860574e7fad7a9527dda599703c573c
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a0d5082590ee03060f0dbb4770d196efc316c328..37fc08d04ff3514d27ad25c8d774a6e96b30c3b1 100644
+index ad740739437be632fc7fedec488a7d0c49534688..ceca8c1bb41a9c258f004863ea8ff76961e6b4f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -576,10 +576,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -578,10 +578,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
     @Override
     public void setPlayerListName(String name) {
@@ -17447,7 +17460,7 @@ index a0d5082590ee03060f0dbb4770d196efc316c328..37fc08d04ff3514d27ad25c8d774a6e9
         if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
         for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
             if (player.getBukkitEntity().canSee(this)) {
-@@ -1431,6 +1436,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1430,6 +1435,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         // Paper start - Teleport passenger API
         // Don't allow teleporting between worlds while keeping passengers
         if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
@@ -17455,7 +17468,7 @@ index a0d5082590ee03060f0dbb4770d196efc316c328..37fc08d04ff3514d27ad25c8d774a6e9
             return false;
         }
 
-@@ -1452,6 +1458,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1451,6 +1457,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         }
 
         if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -17463,7 +17476,7 @@ index a0d5082590ee03060f0dbb4770d196efc316c328..37fc08d04ff3514d27ad25c8d774a6e9
             return false;
         }
 
-@@ -2753,6 +2760,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2752,6 +2759,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         return this.getHandle().getAbilities().walkingSpeed * 2f;
     }
 
@@ -17492,7 +17505,7 @@ index a0d5082590ee03060f0dbb4770d196efc316c328..37fc08d04ff3514d27ad25c8d774a6e9
     private void validateSpeed(float value) {
         Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
     }
-@@ -3554,4 +3583,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3553,4 +3582,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         ((ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer)this.getHandle())
             .moonrise$getViewDistanceHolder().setSendViewDistance(viewDistance);
     }
@@ -17645,7 +17658,7 @@ index 86574da257731de7646a712ed73384955fe35aa3..e223234dd64b0e41441c3b9f649f0b64
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 77ef27f9254235180a8596c6c8c4af750dc759d1..3c533df90cf8b1a69b190ffee06c9254e4e4d764 100644
+index 4632eb883e9f5efde520ee543bcad25827c0da2c..858c6c860d9b8aaa1d3f9f77a9e410726239d7cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -603,6 +603,15 @@ public class CraftEventFactory {
@@ -17682,25 +17695,25 @@ index 77ef27f9254235180a8596c6c8c4af750dc759d1..3c533df90cf8b1a69b190ffee06c9254
             event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 10a5b1853d3984427209c87bdec1d471dddb1244..5e693a93b9d968f1628f86e46a86161f82a5f4c3 100644
+index 674e3a827f8fb64e5c0beefb3c1874d6e8aee4e5..93b3689b4fdaff88bb9846f50d59a7a0960ef41a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -183,8 +183,19 @@ public class CraftContainer extends AbstractContainerMenu {
+@@ -145,8 +145,19 @@ public class CraftContainer extends AbstractContainerMenu {
             case PLAYER:
             case CHEST:
             case ENDER_CHEST:
 +                // Purpur start
-+                this.delegate = new ChestMenu(org.purpurmc.purpur.PurpurConfig.enderChestSixRows ? MenuType.GENERIC_9x6 : MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
+                this.delegate = new ChestMenu(org.purpurmc.purpur.PurpurConfig.enderChestSixRows ? net.minecraft.world.inventory.MenuType.GENERIC_9x6 : net.minecraft.world.inventory.MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
 +                break;
             case BARREL:
-                this.delegate = new ChestMenu(MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
+-                this.delegate = new ChestMenu(net.minecraft.world.inventory.MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
 +                this.delegate = new ChestMenu(switch (org.purpurmc.purpur.PurpurConfig.barrelRows) {
-+                    case 6 -> MenuType.GENERIC_9x6;
-+                    case 5 -> MenuType.GENERIC_9x5;
-+                    case 4 -> MenuType.GENERIC_9x4;
-+                    case 2 -> MenuType.GENERIC_9x2;
-+                    case 1 -> MenuType.GENERIC_9x1;
-+                    default -> MenuType.GENERIC_9x3;
+                case 6 -> net.minecraft.world.inventory.MenuType.GENERIC_9x6;
+                case 5 -> net.minecraft.world.inventory.MenuType.GENERIC_9x5;
+                case 4 -> net.minecraft.world.inventory.MenuType.GENERIC_9x4;
+                case 2 -> net.minecraft.world.inventory.MenuType.GENERIC_9x2;
+                case 1 -> net.minecraft.world.inventory.MenuType.GENERIC_9x1;
+                default -> net.minecraft.world.inventory.MenuType.GENERIC_9x3;
 +                }, windowId, bottom, top, top.getContainerSize() / 9);
 +                // Purpur end
                 break;
--- a/patches/server/0015-Remove-Timings.patch
+++ b/patches/server/0015-Remove-Timings.patch
@@ -1325,7 +1325,7 @@ index b044de2a7af189e4ee4c8d72212fb8b7612f8a3a..20f1069230fcef4a00deec4c0ae6fdc6
 
         }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5bf0ddcf797e8e1ddaff31841e574089159b6928..a66c3ce90af1a3566bd5055a5dec6280b97d3df8 100644
+index f93ef54bbb02d0749a42aeebf8425472804cd213..63678ff4e0948c7c67e092f446e0bfa358695887 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,7 +1335,7 @@ index 5bf0ddcf797e8e1ddaff31841e574089159b6928..a66c3ce90af1a3566bd5055a5dec6280
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-@@ -1294,7 +1293,6 @@ public abstract class PlayerList {
+@@ -1299,7 +1298,6 @@ public abstract class PlayerList {
 
     public void saveAll(int interval) {
         io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -1343,7 +1343,7 @@ index 5bf0ddcf797e8e1ddaff31841e574089159b6928..a66c3ce90af1a3566bd5055a5dec6280
         int numSaved = 0;
         long now = MinecraftServer.currentTick;
         for (int i = 0; i < this.players.size(); ++i) {
-@@ -1305,7 +1303,6 @@ public abstract class PlayerList {
+@@ -1310,7 +1308,6 @@ public abstract class PlayerList {
             }
             // Paper end - Incremental chunk and player saving
         }
@@ -1639,7 +1639,7 @@ index 4aa33233060b2b2bd809d92d35bd0933cb015d41..5ad94cabbab741d69363d40df359075d
 
         @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5d7280ad82c03b35ea6636d633ef411c220f9bb6..5bb054398651fedc99c5bb454e638ba3a694b9c8 100644
+index 91548197ef6665e271a9104fd2cb8a3a38ea05b1..f29b9be2a7ab617191161e1ff2a16b5a3d3c7b3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -478,7 +478,6 @@ public final class CraftServer implements Server {
@@ -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 4f65503d9989530bd34734d27d30699df93c24cc..3ecdc98b20888422b5f566e1bfe1c8cef6ea8a54 100644
+index d2c34cc068ac7943844ad38ac92d2af774e211fa..3786f6944b0b025c33749c301c2d11b33311a02a 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 {
--- a/patches/server/0017-Remove-vanilla-username-check.patch
+++ b/patches/server/0017-Remove-vanilla-username-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove vanilla username check


 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
-index cbe2789f8a055550dd7840a7bed980efd65eb9a1..a903ff5303a07bbe310c0d6aaff5b7894e2d2de2 100644
+index 9a7add1a7b137a0c9ca9c69fec674a7720d954eb..7797c4ec493e0421748cc2e623033c9f028d8e88 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
-@@ -271,7 +271,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
+@@ -293,7 +293,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
 
     private static GameProfile createAuthLibProfile(UUID uniqueId, String name) {
         Preconditions.checkArgument(name == null || name.length() <= 16, "Name cannot be longer than 16 characters");
@@ -18,10 +18,10 @@ index cbe2789f8a055550dd7840a7bed980efd65eb9a1..a903ff5303a07bbe310c0d6aaff5b789
             uniqueId != null ? uniqueId : Util.NIL_UUID,
             name != null ? name : ""
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 72cf1372a7e685b3ff4cc852c3d38f7d4f8fc5ad..cccf95f68b40b5fc1ac533e9d0d7d2c1c6334df8 100644
+index fac4130957d35609ea9d281866f95f360fce3b35..2fd40cf41d54e450939d11b8ea183ab248072e22 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -182,7 +182,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -187,7 +187,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
         // Gale start - JettPack - reduce array allocations
         Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", me.titaniumtown.ArrayConstants.emptyObjectArray);
         // Paper start - Validate usernames
@@ -32,17 +32,17 @@ index 72cf1372a7e685b3ff4cc852c3d38f7d4f8fc5ad..cccf95f68b40b5fc1ac533e9d0d7d2c1
             && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) {
             Validate.validState(StringUtil.isReasonablePlayerName(packet.name()), "Invalid characters in username", me.titaniumtown.ArrayConstants.emptyObjectArray);
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index 0121c90dd7f57be5f484f970f78747a92a734611..86223b0c5ec585080ae90569fb2b52223bb7d6e6 100644
+index f58dec12326734c61f4bc2298a87fb38f1ac1dc4..66eff9ddee09f44935df6d8ed3eb24943b603581 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-@@ -65,7 +65,7 @@ public final class CraftPlayerProfile implements PlayerProfile, com.destroystoky
-     public CraftPlayerProfile(UUID uniqueId, String name) {
+@@ -79,7 +79,7 @@ public final class CraftPlayerProfile implements PlayerProfile, com.destroystoky
             Preconditions.checkArgument((uniqueId != null) || !StringUtils.isBlank(name), "uniqueId is null or name is blank");
+         }
         Preconditions.checkArgument(name == null || name.length() <= 16, "The name of the profile is longer than 16 characters"); // Paper - Validate
 -        Preconditions.checkArgument(name == null || net.minecraft.util.StringUtil.isValidPlayerName(name), "The name of the profile contains invalid characters: %s", name); // Paper - Validate
 +        Preconditions.checkArgument(name == null || org.dreeam.leaf.config.modules.misc.RemoveVanillaUsernameCheck.enabled || net.minecraft.util.StringUtil.isValidPlayerName(name), "The name of the profile contains invalid characters: %s", name); // Paper - Validate // Leaf - Remove Vanilla username check
-         this.uniqueId = (uniqueId == null) ? Util.NIL_UUID : uniqueId;
-         this.name = (name == null) ? "" : name;
+         this.uniqueId = uniqueId;
+         this.name = name;
     }
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveVanillaUsernameCheck.java b/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveVanillaUsernameCheck.java
 new file mode 100644
--- a/patches/server/0020-KeYi-Player-Skull-API.patch
+++ b/patches/server/0020-KeYi-Player-Skull-API.patch
@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi

 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 37fc08d04ff3514d27ad25c8d774a6e96b30c3b1..d57cb8e3fec8db07dea328abeada47829eda111c 100644
+index ceca8c1bb41a9c258f004863ea8ff76961e6b4f0..7afbcd8f44ec11b8ba77e0cbc7b084d92ab43239 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3649,4 +3649,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3648,4 +3648,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
     }
     // Purpur end
--- a/patches/server/0027-Slice-Smooth-Teleports.patch
+++ b/patches/server/0027-Slice-Smooth-Teleports.patch
@@ -19,7 +19,7 @@ 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 a66c3ce90af1a3566bd5055a5dec6280b97d3df8..001439f714506b734b389f345716ac2e4e4a5893 100644
+index 63678ff4e0948c7c67e092f446e0bfa358695887..272c5a875d1a4d6c6c7a100fea8abbb26776b68f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -904,10 +904,10 @@ public abstract class PlayerList {
@@ -36,10 +36,10 @@ index a66c3ce90af1a3566bd5055a5dec6280b97d3df8..001439f714506b734b389f345716ac2e
         entityplayer1.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
         entityplayer1.connection.send(new ClientboundSetExperiencePacket(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d57cb8e3fec8db07dea328abeada47829eda111c..04aa0c7d2946a38427951217f2b865b005011ef5 100644
+index 7afbcd8f44ec11b8ba77e0cbc7b084d92ab43239..45f587027f9e647c0630408a659c7fc37f8e5980 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1361,6 +1361,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1360,6 +1360,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         // Paper end
     }
 
--- a/patches/server/0030-Leaves-Protocol-Core.patch
+++ b/patches/server/0030-Leaves-Protocol-Core.patch
@@ -49,7 +49,7 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17
 
         assert isValidPath(path);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3220e5d9a2dfd80da573047bcdab7faf6a78398e..64792ae9fd6ca979c51980ce23697d9dc29b396a 100644
+index 1578fb315db16933059ed9c17b883059762f8603..4652e1d7f8b49faa36e632b1ce36b010fe1cc582 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1809,6 +1809,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -62,10 +62,10 @@ index 3220e5d9a2dfd80da573047bcdab7faf6a78398e..64792ae9fd6ca979c51980ce23697d9d
             ((Runnable) this.tickables.get(i)).run();
         }
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index b66fdb789fcb460d63fd81540112d655c9a0c3f2..ae0d0310d50f1ada082e045a58a24a43f8079da8 100644
+index 51c8d265f6c40b872efd7e03dccd162a52edff09..648a342c309c12dedf7d70b88163f80fb72150cf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -169,6 +169,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -174,6 +174,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
 
     @Override
     public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -77,7 +77,7 @@ index b66fdb789fcb460d63fd81540112d655c9a0c3f2..ae0d0310d50f1ada082e045a58a24a43
         // Paper start - Brand support
         if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload brandPayload) {
             this.player.clientBrandName = brandPayload.brand();
-@@ -186,6 +191,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -191,6 +196,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                 String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
                 for (String channel : channels.split("\0")) {
                     this.getCraftPlayer().addChannel(channel);
@@ -86,7 +86,7 @@ index b66fdb789fcb460d63fd81540112d655c9a0c3f2..ae0d0310d50f1ada082e045a58a24a43
             } catch (Exception ex) {
                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6bf9d97992b17aa985e16d9367b64bbe1b0b6dfe..8e8346394ba5c48c551050725decbb7f6a91098a 100644
+index 272c5a875d1a4d6c6c7a100fea8abbb26776b68f..73b69eb3b986cad3fee4bbf381833a363600ec64 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -363,6 +363,8 @@ public abstract class PlayerList {
@@ -107,7 +107,7 @@ index 6bf9d97992b17aa985e16d9367b64bbe1b0b6dfe..8e8346394ba5c48c551050725decbb7f
         org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
         ServerLevel worldserver = entityplayer.serverLevel();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5bb054398651fedc99c5bb454e638ba3a694b9c8..07fcea774aa13d5d5dc9b5db7f515d5bf05df1ce 100644
+index f29b9be2a7ab617191161e1ff2a16b5a3d3c7b3b..b1d269588f7df320d079f1456ffc188bf8af1716 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -493,6 +493,7 @@ public final class CraftServer implements Server {
--- a/patches/server/0033-Leaves-Xaero-Map-Protocol.patch
+++ b/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 0adb25590da474d4939957447f0b98e1367c5852..ec3ee8a6c14660a55dd868ca557ccffae0a94674 100644
+index 73b69eb3b986cad3fee4bbf381833a363600ec64..345dba02d52478d4c2c045936fce5e4e9982b942 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1333,6 +1333,7 @@ public abstract class PlayerList {
+@@ -1338,6 +1338,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()));
--- a/patches/server/0037-Leaves-Replay-Mod-API.patch
+++ b/patches/server/0037-Leaves-Replay-Mod-API.patch
@@ -215,7 +215,7 @@ index b2ae3fdf128e7d66e3f3430266321a6a09fa0be6..7c6bda95b8b08cc70182f19cf0b991f7
         this.stats = server.getPlayerList().getPlayerStats(this);
         this.advancements = server.getPlayerList().getPlayerAdvancements(this);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ec3ee8a6c14660a55dd868ca557ccffae0a94674..2aab59f6f0f9df50d3c54cbc55e9c9574b12087e 100644
+index 345dba02d52478d4c2c045936fce5e4e9982b942..2d502a956084ccab08342f98a91d03e5b01b19dd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -158,6 +158,7 @@ public abstract class PlayerList {
@@ -415,7 +415,7 @@ index ec3ee8a6c14660a55dd868ca557ccffae0a94674..2aab59f6f0f9df50d3c54cbc55e9c957
             }
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 07fcea774aa13d5d5dc9b5db7f515d5bf05df1ce..9a677b5dac3474ad4f6605c6aaa3e675d94537df 100644
+index b1d269588f7df320d079f1456ffc188bf8af1716..bdecd0fdd56f91072fc2eb5768857a607b40bbb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -320,6 +320,8 @@ public final class CraftServer implements Server {
@@ -436,7 +436,7 @@ index 07fcea774aa13d5d5dc9b5db7f515d5bf05df1ce..9a677b5dac3474ad4f6605c6aaa3e675
             @Override
             public CraftPlayer apply(ServerPlayer player) {
                 return player.getBukkitEntity();
-@@ -3378,4 +3380,11 @@ public final class CraftServer implements Server {
+@@ -3375,4 +3377,11 @@ public final class CraftServer implements Server {
         return getServer().lagging;
     }
     // Purpur end
@@ -462,10 +462,10 @@ index bec40e26e17ba6fdefb68c79e2fa7a9593b0f4fe..c7c8e651e8165e9200cdcc72b0b55c6a
         if (entity instanceof EnderDragonPart complexPart) {
             if (complexPart.parentMob instanceof EnderDragon) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 04aa0c7d2946a38427951217f2b865b005011ef5..02499131e2c38d67e2b6cfdf86712db5801f13d8 100644
+index 45f587027f9e647c0630408a659c7fc37f8e5980..05ddb57f827ebf6c59bba5f1c2652da580e785dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2259,7 +2259,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2258,7 +2258,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
     @Override
     public boolean canSee(Player player) {
--- a/patches/server/0043-Reduce-canSee-work.patch
+++ b/patches/server/0043-Reduce-canSee-work.patch
@@ -36,10 +36,10 @@ index 24ed26286c7e3e45279b6b27cd0a432b37fda4b2..83fcdd4d090bfc8801a640b2a5645313
             if (net.minecraft.world.phys.shapes.Shapes.joinIsNotEmpty(voxelshape, net.minecraft.world.phys.shapes.Shapes.create(entity.getBoundingBox()), net.minecraft.world.phys.shapes.BooleanOp.AND)) {
                 return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 02499131e2c38d67e2b6cfdf86712db5801f13d8..8a758081cf145345298863a090befd36ab6d07b8 100644
+index 05ddb57f827ebf6c59bba5f1c2652da580e785dd..ab85eaf62ba901ace0ed25773df980a5ac97729a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -638,6 +638,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -640,6 +640,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return false;
         }
         OfflinePlayer other = (OfflinePlayer) obj;
--- a/patches/server/0057-SparklyPaper-Optimize-canSee-checks.patch
+++ b/patches/server/0057-SparklyPaper-Optimize-canSee-checks.patch
@@ -29,7 +29,7 @@ index 4d91b50e527320647f6c9aa20fc5da071c3fdee0..dde015810f6e914ad99dcb8ab66c7aa3
                 }
                 // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8a758081cf145345298863a090befd36ab6d07b8..0ef581ae18b0b272f36d64c1d58146d3c8f01ad1 100644
+index ab85eaf62ba901ace0ed25773df980a5ac97729a..db125b4d4e68f3c9f8c661b6b5f08d26f146008e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -200,7 +200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -41,7 +41,7 @@ index 8a758081cf145345298863a090befd36ab6d07b8..0ef581ae18b0b272f36d64c1d58146d3
     private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
     private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
     private int hash = 0;
-@@ -2265,9 +2265,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2264,9 +2264,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
     @Override
     public boolean canSee(org.bukkit.entity.Entity entity) {
--- a/patches/server/0061-Including-5s-in-getTPS.patch
+++ b/patches/server/0061-Including-5s-in-getTPS.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Including 5s in getTPS()


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9a677b5dac3474ad4f6605c6aaa3e675d94537df..1b9685f759481282ba4be599169a60aba2b2012a 100644
+index bdecd0fdd56f91072fc2eb5768857a607b40bbb9..72e3db6b666913c20e5435bb606fb506a74458da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3115,6 +3115,8 @@ public final class CraftServer implements Server {
+@@ -3112,6 +3112,8 @@ public final class CraftServer implements Server {
 
     @Override
     public double[] getTPS() {
--- a/patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch
+++ b/patches/server/0062-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 2aab59f6f0f9df50d3c54cbc55e9c9574b12087e..5cffe034571ef1ddf868d22fc38b1a8c2a1500f1 100644
+index 2d502a956084ccab08342f98a91d03e5b01b19dd..f073b87e6b214e08672980f8f229cd436a742def 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1682,6 +1682,8 @@ public abstract class PlayerList {
+@@ -1687,6 +1687,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 2aab59f6f0f9df50d3c54cbc55e9c9574b12087e..5cffe034571ef1ddf868d22fc38b1a8c
             if (!file1.exists()) {
                 File file2 = new File(file, displayName + ".json"); // CraftBukkit
                 Path path = file2.toPath();
-@@ -1690,6 +1692,8 @@ public abstract class PlayerList {
+@@ -1695,6 +1697,8 @@ public abstract class PlayerList {
                     file2.renameTo(file1);
                 }
             }
--- a/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch
+++ b/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch
@@ -83,10 +83,10 @@ index 0e6d92f450613b1c617ecf723d44d17743f521e2..af820999e45aba5f62b9a89bf3753ea0
 
         // Paper start - Add setting for proxy online mode status
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index ae0d0310d50f1ada082e045a58a24a43f8079da8..eea19f895588c51bce86f20b3ec505fd3ac3f077 100644
+index 648a342c309c12dedf7d70b88163f80fb72150cf..b8b2914543f4bfe71a9734e3d848fba0acd707fc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -337,10 +337,29 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -342,10 +342,29 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
     }
 
     public void send(Packet<?> packet) {
@@ -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 714e0bf56ee866b4ba00953074bec9642cc5f08e..901d1e8826b1ce235f2bd2382bb6b6d2674f5174 100644
+index 70607537c900b1af1ddef0ea1f33612c7724299d..de30155875f1c279a35dc7e0506f69b1b583b1f6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1636,7 +1636,7 @@ public abstract class PlayerList {
+@@ -1641,7 +1641,7 @@ public abstract class PlayerList {
         // Paper end
         boolean flag = this.verifyChatTrusted(message);
 
@@ -129,7 +129,7 @@ index 714e0bf56ee866b4ba00953074bec9642cc5f08e..901d1e8826b1ce235f2bd2382bb6b6d2
         OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message);
         boolean flag1 = false;
 
-@@ -1665,6 +1665,7 @@ public abstract class PlayerList {
+@@ -1670,6 +1670,7 @@ public abstract class PlayerList {
     }
 
     public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
--- a/patches/server/0068-Cache-player-profileResult.patch
+++ b/patches/server/0068-Cache-player-profileResult.patch
@@ -20,10 +20,10 @@ index e16e9b3b815065ed4aae1965edc3a68471470ec5..57f309dc5259a4ca935c12c99e835734
     implementation("org.jline:jline-terminal-jansi:3.26.3") // Leaf - Bump Dependencies
     implementation("net.minecrell:terminalconsoleappender:1.3.0")
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index cccf95f68b40b5fc1ac533e9d0d7d2c1c6334df8..a6a1fe9ba187549d13fe1821bf4b8fc37fbe0a0a 100644
+index 2fd40cf41d54e450939d11b8ea183ab248072e22..3539397dba1246f345cd3cd210a6e6db876b1c89 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -88,6 +88,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -93,6 +93,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
     private ServerPlayer player; // CraftBukkit
     public boolean iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation = false; // Paper - username validation overriding
     private int velocityLoginMessageId = -1; // Paper - Add Velocity IP Forwarding Support
@@ -35,7 +35,7 @@ index cccf95f68b40b5fc1ac533e9d0d7d2c1c6334df8..a6a1fe9ba187549d13fe1821bf4b8fc3
 
     public ServerLoginPacketListenerImpl(MinecraftServer server, Connection connection, boolean transferred) {
         this.state = ServerLoginPacketListenerImpl.State.HELLO;
-@@ -315,7 +320,19 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -320,7 +325,19 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
                 String s1 = (String) Objects.requireNonNull(ServerLoginPacketListenerImpl.this.requestedUsername, "Player name not initialized");
 
                 try {
--- a/patches/server/0078-Configurable-connection-message.patch
+++ b/patches/server/0078-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 901d1e8826b1ce235f2bd2382bb6b6d2674f5174..61bee21d922d2e093fae4b59b211be3915a44fb5 100644
+index de30155875f1c279a35dc7e0506f69b1b583b1f6..b58d4699b4496658934ad9cd713aec9a000dd08e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -455,7 +455,7 @@ public abstract class PlayerList {
@@ -35,7 +35,7 @@ index 901d1e8826b1ce235f2bd2382bb6b6d2674f5174..61bee21d922d2e093fae4b59b211be39
         this.cserver.getPluginManager().callEvent(playerQuitEvent);
         entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
 
-@@ -1809,4 +1809,29 @@ public abstract class PlayerList {
+@@ -1814,4 +1814,29 @@ public abstract class PlayerList {
     public boolean isAllowCommandsForAllPlayers() {
         return this.allowCommandsForAllPlayers;
     }