Fix compilation issues (#1509)

2026-02-17 16:37:43 +01:00 · 2024-04-28 22:23:25 +02:00
parent 9d2dae3c9c
commit dc9993f4d1
36 changed files with 207 additions and 258 deletions
--- a/patches/api/0015-ItemStack-convenience-methods.patch
+++ b/patches/api/0015-ItemStack-convenience-methods.patch
@@ -50,10 +50,10 @@ index 82d009c0bbe4b3026a535e02d6e0ed20c7bd525d..0366400fe6dea7af40badaa3335b49ff
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 84a7bf0936d35bf42b5ed038d295d5c31740f472..4eb8ade7116b6271baf5b99917c66c7156d8e594 100644
+index 84a7bf0936d35bf42b5ed038d295d5c31740f472..6e9b4cbc81878616b1c48add5db534286d267b05 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
+@@ -17,6 +17,17 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.MaterialData;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -67,12 +67,11 @@ index 84a7bf0936d35bf42b5ed038d295d5c31740f472..4eb8ade7116b6271baf5b99917c66c71
 +import org.bukkit.inventory.meta.Repairable;
 +import org.bukkit.persistence.PersistentDataContainer;
 +import org.bukkit.persistence.PersistentDataHolder;
-+import com.destroystokyo.paper.Namespaced;
 +// Purpur end
 
 /**
  * Represents a stack of items.
-@@ -1073,4 +1085,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1073,4 +1084,565 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
         return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
     }
     // Paper end - expose itemstack tooltip lines
@@ -557,67 +556,6 @@ index 84a7bf0936d35bf42b5ed038d295d5c31740f472..4eb8ade7116b6271baf5b99917c66c71
 +    }
 +
 +    /**
-+     * Gets the collection of namespaced keys that the item can destroy in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @return Set of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    @NotNull
-+    public java.util.Set<Namespaced> getDestroyableKeys() {
-+        return getItemMeta().getDestroyableKeys();
-+    }
-+
-+    /**
-+     * Sets the collection of namespaced keys that the item can destroy in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @param canDestroy Collection of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    public void setDestroyableKeys(@NotNull Collection<Namespaced> canDestroy) {
-+        ItemMeta itemMeta = getItemMeta();
-+        itemMeta.setDestroyableKeys(canDestroy);
-+        setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Gets the collection of namespaced keys that the item can be placed on in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @return Set of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    @NotNull
-+    public java.util.Set<Namespaced> getPlaceableKeys() {
-+        return getItemMeta().getPlaceableKeys();
-+    }
-+
-+    /**
-+     * Sets the set of namespaced keys that the item can be placed on in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @param canPlaceOn Collection of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    @NotNull
-+    public void setPlaceableKeys(@NotNull Collection<Namespaced> canPlaceOn) {
-+        ItemMeta itemMeta = getItemMeta();
-+        itemMeta.setPlaceableKeys(canPlaceOn);
-+        setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Checks for the existence of any keys that the item can be placed on
-+     *
-+     * @return true if this item has placeable keys
-+     */
-+    public boolean hasPlaceableKeys() {
-+        return hasItemMeta() && getItemMeta().hasPlaceableKeys();
-+    }
-+
-+    /**
-+     * Checks for the existence of any keys that the item can destroy
-+     *
-+     * @return true if this item has destroyable keys
-+     */
-+    public boolean hasDestroyableKeys() {
-+        return hasItemMeta() && getItemMeta().hasDestroyableKeys();
-+    }
-+
-+    /**
 +     * Repairs this item by 1 durability
 +     */
 +    public void repair() {
@@ -662,7 +600,7 @@ index 84a7bf0936d35bf42b5ed038d295d5c31740f472..4eb8ade7116b6271baf5b99917c66c71
 +    public boolean damage(int amount, boolean ignoreUnbreaking) {
 +        Damageable damageable = (Damageable) getItemMeta();
 +        if (amount > 0) {
-+            int unbreaking = getEnchantLevel(Enchantment.DURABILITY);
+            int unbreaking = getEnchantLevel(Enchantment.UNBREAKING);
 +            int reduce = 0;
 +            for (int i = 0; unbreaking > 0 && i < amount; ++i) {
 +                if (reduceDamage(java.util.concurrent.ThreadLocalRandom.current(), unbreaking)) {
--- a/patches/api/0049-Add-hover-lines-API.patch
+++ b/patches/api/0049-Add-hover-lines-API.patch
@@ -24,10 +24,10 @@ index 98a970a6582dca22e719a31559c7becea4725cb2..1cd2962ceb4fa0a0a3e28a09fa4ccef5
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 4eb8ade7116b6271baf5b99917c66c7156d8e594..80e0978c032ccbe9546515e1fe29de5820c7e7f0 100644
+index 6e9b4cbc81878616b1c48add5db534286d267b05..e497575b2f44bb8b3bb6fdda3ae2f5247cbb4679 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1706,5 +1706,14 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1644,5 +1644,14 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
         }
         return random.nextInt(unbreaking + 1) > 0;
     }
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -6248,7 +6248,7 @@ index 0000000000000000000000000000000000000000..ba2a37dad43e238e54632975abea8ee6
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7e3994879a2b1de0c504f122b0c3c3229e4c356
+index 0000000000000000000000000000000000000000..89c476c740b4efb4f44c1dcd384b908626d96780
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
@@ -0,0 +1,100 @@
@@ -6296,7 +6296,7 @@ index 0000000000000000000000000000000000000000..b7e3994879a2b1de0c504f122b0c3c32
 +        Vec3 mot = this.getDeltaMovement();
 +        HitResult hitResult = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
 +
-+        this.preOnHit(hitResult);
+        this.preHitTargetOrDeflectSelf(hitResult);
 +
 +        double x = this.getX() + mot.x;
 +        double y = this.getY() + mot.y;
@@ -6354,7 +6354,7 @@ index 0000000000000000000000000000000000000000..b7e3994879a2b1de0c504f122b0c3c32
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bc139e518c8214246c3f514b64f987bdd5de6f23
+index 0000000000000000000000000000000000000000..c0b7e0eeffdf31b88662232b07944bf3e6fa2148
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
@@ -0,0 +1,114 @@
@@ -6404,7 +6404,7 @@ index 0000000000000000000000000000000000000000..bc139e518c8214246c3f514b64f987bd
 +        Vec3 mot = this.getDeltaMovement();
 +        HitResult hitResult = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
 +
-+        this.preOnHit(hitResult);
+        this.preHitTargetOrDeflectSelf(hitResult);
 +
 +        double x = this.getX() + mot.x;
 +        double y = this.getY() + mot.y;
@@ -6454,7 +6454,7 @@ index 0000000000000000000000000000000000000000..bc139e518c8214246c3f514b64f987bd
 +            if (canGrief || (target instanceof LivingEntity && !(target instanceof ArmorStand))) {
 +                boolean hurt = target.hurt(target.damageSources().mobProjectile(this, (LivingEntity) shooter), level().purpurConfig.phantomFlameDamage);
 +                if (hurt && level().purpurConfig.phantomFlameFireTime > 0) {
-+                    target.setSecondsOnFire(level().purpurConfig.phantomFlameFireTime);
+                    target.igniteForSeconds(level().purpurConfig.phantomFlameFireTime);
 +                }
 +            }
 +        }
--- a/patches/server/0056-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch
@@ -18,7 +18,7 @@ index a207a31d80a302dbdfe80f8727222542d3a78da2..7ca70e9ddda24e2fe661c7b13fa439a6
         if (entry != null) {
             ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5..f47575bb8cc5e31ef3583cf6ed94604c1da60932 100644
+index 36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5..9df30e61d97d7c403adede631df2a6825b986496 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -636,6 +636,16 @@ public final class ItemStack implements DataComponentHolder {
@@ -28,7 +28,7 @@ index 36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5..f47575bb8cc5e31ef3583cf6ed94604c
 +    // Purpur start
 +    public float getDamagePercent() {
 +        if (isDamaged()) {
-+            return (float) getDamageValue() / (float) getItem().getMaxDamage();
+            return (float) getDamageValue() / (float) getMaxDamage();
 +        } else {
 +            return 0F;
 +        }
--- a/patches/server/0058-Implement-elytra-settings.patch
+++ b/patches/server/0058-Implement-elytra-settings.patch
@@ -27,7 +27,7 @@ index ed8833ed95584cdf9be2b931915277c04beac6ee..9a2725e3f61a7d37943518cc760b1785
 
                     this.gameEvent(GameEvent.ELYTRA_GLIDE);
 diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index 218f2f085309f04438f8b07bc41cf242583db2dc..c6e8ce19fde69316d9523c90105660992f728cfb 100644
+index 218f2f085309f04438f8b07bc41cf242583db2dc..ea8e49b42b9dde74784189430be66ed6978015dd 100644
 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
@@ -65,6 +65,14 @@ public class FireworkRocketItem extends Item implements ProjectileItem {
@@ -38,7 +38,7 @@ index 218f2f085309f04438f8b07bc41cf242583db2dc..c6e8ce19fde69316d9523c9010566099
 +                    if (world.purpurConfig.elytraDamagePerFireworkBoost > 0) {
 +                        ItemStack chestItem = user.getItemBySlot(net.minecraft.world.entity.EquipmentSlot.CHEST);
 +                        if (chestItem.getItem() == Items.ELYTRA) {
-+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerFireworkBoost, user, (entityliving) -> entityliving.broadcastBreakEvent(net.minecraft.world.entity.EquipmentSlot.CHEST));
+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerFireworkBoost, user, net.minecraft.world.entity.EquipmentSlot.CHEST);
 +                        }
 +                    }
 +                    // Purpur end
@@ -46,7 +46,7 @@ index 218f2f085309f04438f8b07bc41cf242583db2dc..c6e8ce19fde69316d9523c9010566099
                         itemStack.shrink(1);
                     } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f47575bb8cc5e31ef3583cf6ed94604c1da60932..206f6409a17eb0db1ced8c7a90127ed375329a44 100644
+index 9df30e61d97d7c403adede631df2a6825b986496..a1bf3368450386015c64b711c01471dad8dc5ccd 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -663,7 +663,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -64,7 +64,7 @@ index f47575bb8cc5e31ef3583cf6ed94604c1da60932..206f6409a17eb0db1ced8c7a90127ed3
                 Item item = this.getItem();
 +                // Purpur start
 +                if (item == Items.ELYTRA) {
-+                    setDamageValue(item.getMaxDamage() - 1);
+                    setDamageValue(getMaxDamage() - 1);
 +                    return;
 +                }
 +                // Purpur end
@@ -72,7 +72,7 @@ index f47575bb8cc5e31ef3583cf6ed94604c1da60932..206f6409a17eb0db1ced8c7a90127ed3
                 if (this.count == 1 && entity instanceof net.minecraft.world.entity.player.Player) {
                     org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((net.minecraft.world.entity.player.Player) entity, this);
 diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 47de500fddb0716d142f8f5876a82a95afaa06fa..129f829cc238ff2f6586511f80eb6da2e8c7ece4 100644
+index 47de500fddb0716d142f8f5876a82a95afaa06fa..b094f4ec513194e10442156d8f7f2205da2384ac 100644
 --- a/src/main/java/net/minecraft/world/item/TridentItem.java
 +++ b/src/main/java/net/minecraft/world/item/TridentItem.java
@@ -123,6 +123,14 @@ public class TridentItem extends Item implements ProjectileItem {
@@ -83,7 +83,7 @@ index 47de500fddb0716d142f8f5876a82a95afaa06fa..129f829cc238ff2f6586511f80eb6da2
 +                        // Purpur start
 +                        ItemStack chestItem = entityhuman.getItemBySlot(EquipmentSlot.CHEST);
 +                        if (chestItem.getItem() == Items.ELYTRA && world.purpurConfig.elytraDamagePerTridentBoost > 0) {
-+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerTridentBoost, entityhuman, (entity) -> entity.broadcastBreakEvent(EquipmentSlot.CHEST));
+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerTridentBoost, entityhuman, EquipmentSlot.CHEST);
 +                        }
 +                        // Purpur end
 +
--- a/patches/server/0077-Dispensers-place-anvils-option.patch
+++ b/patches/server/0077-Dispensers-place-anvils-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option


 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 5dab1e10303177e5a4d97a91ee46ede66f30ae35..c15f3430e767e54c4953e18bb9e8dcb6283caadf 100644
+index 5dab1e10303177e5a4d97a91ee46ede66f30ae35..68236139e3571791b891dbbef6e3ee20031e16d9 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
@@ -1048,5 +1048,22 @@ public interface DispenseItemBehavior {
@@ -16,7 +16,7 @@ index 5dab1e10303177e5a4d97a91ee46ede66f30ae35..c15f3430e767e54c4953e18bb9e8dcb6
 +        DispenserBlock.registerBehavior(Items.ANVIL, (new OptionalDispenseItemBehavior() {
 +            @Override
 +            public ItemStack execute(BlockSource dispenser, ItemStack stack) {
-+                Level level = dispenser.level();
+                net.minecraft.world.level.Level level = dispenser.level();
 +                if (!level.purpurConfig.dispenserPlaceAnvils) return super.execute(dispenser, stack);
 +                Direction facing = dispenser.blockEntity().getBlockState().getValue(DispenserBlock.FACING);
 +                BlockPos pos = dispenser.pos().relative(facing);
--- a/patches/server/0092-Infinity-bow-settings.patch
+++ b/patches/server/0092-Infinity-bow-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Infinity bow settings


 diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
-index 5ca843df5b4caa668953e5e36a9b20fabeb35046..9553e68f0e34de41a3f337dd4fa45d5103def8bb 100644
+index 5ca843df5b4caa668953e5e36a9b20fabeb35046..4ae6b98b6a0d41e949b055f0678200a672a1df38 100644
 --- a/src/main/java/net/minecraft/world/item/BowItem.java
 +++ b/src/main/java/net/minecraft/world/item/BowItem.java
@@ -29,7 +29,7 @@ public class BowItem extends ProjectileWeaponItem {
@@ -22,7 +22,7 @@ index 5ca843df5b4caa668953e5e36a9b20fabeb35046..9553e68f0e34de41a3f337dd4fa45d51
         ItemStack itemStack = user.getItemInHand(hand);
         boolean bl = !user.getProjectile(itemStack).isEmpty();
 -        if (!user.hasInfiniteMaterials() && !bl) {
-+        if (!(world.purpurConfig.infinityWorksWithoutArrows && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY_ARROWS, itemStack) > 0) && !user.hasInfiniteMaterials() && !bl) {
+        if (!(world.purpurConfig.infinityWorksWithoutArrows && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY, itemStack) > 0) && !user.hasInfiniteMaterials() && !bl) {
             return InteractionResultHolder.fail(itemStack);
         } else {
             user.startUsingItem(hand);
--- a/patches/server/0099-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0099-Make-entity-breeding-times-configurable.patch
@@ -299,6 +299,22 @@ index 8aaac4e86ec6d9c40999f6198cda7d367ece54e3..4212c3921a4059c539ca37f9609ef505
     @Override
     protected void registerGoals() {
         this.goalSelector.addGoal(1, new FloatGoal(this));
+diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index b38281f963377cc82b360e8457da7cad033b8c36..29412208e329e9fc211b844822a2fc3328a5bc89 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -469,4 +469,11 @@ public class Armadillo extends Animal {
+             return this.animationDuration;
+         }
+     }
+
+    // Purpur start
+    @Override
+    public int getPurpurBreedTime() {
+        return 6000;
+    }
+    // Purpur end
+ }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 index 414ff28670c3d36dc78e3df4d39b6d4eb3ec1e77..97ba327398d84db09c81cee860b40642b428ea48 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
--- a/patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -37,7 +37,7 @@ index da0d1c9a1c4ae081bff9ca4230c9a1503885c354..9af8fcf6abb9b768829592bc1b091ebe
 
                 if (!itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
-index 40e7112669abb58a0ab6df1846afec3979e95e55..0ac22b77f021b4ab40cabd19132fec5a0cbf4f3e 100644
+index 40e7112669abb58a0ab6df1846afec3979e95e55..183464f202d4c2774840edfde1dfcab44d05d0d3 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
@@ -151,7 +151,13 @@ public class Painting extends HangingEntity implements VariantHolder<Holder<Pain
@@ -47,8 +47,8 @@ index 40e7112669abb58a0ab6df1846afec3979e95e55..0ac22b77f021b4ab40cabd19132fec5a
 -            this.spawnAtLocation(Items.PAINTING);
 +            // Purpur start
 +            final ItemStack painting = new ItemStack(Items.PAINTING);
-+            if (!this.level().purpurConfig.persistentDroppableEntityDisplayNames)) {
-+                painting.set(DataComponents.CUSTOM_NAME, null);
+            if (!this.level().purpurConfig.persistentDroppableEntityDisplayNames) {
+                painting.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, null);
 +            }
 +            this.spawnAtLocation(painting);
 +            // Purpur end
@@ -56,7 +56,7 @@ index 40e7112669abb58a0ab6df1846afec3979e95e55..0ac22b77f021b4ab40cabd19132fec5a
     }
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 0b23e05f936cab7a9867828c2d69417cfde1d2ce..259c3abb877ab38bc28ebdca5672c1a8ecf3b57f 100644
+index 0b23e05f936cab7a9867828c2d69417cfde1d2ce..105e2b7d7cd7c64a9164e4114476e44f29433f49 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
@@ -963,7 +963,13 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
@@ -67,7 +67,7 @@ index 0b23e05f936cab7a9867828c2d69417cfde1d2ce..259c3abb877ab38bc28ebdca5672c1a8
 +        // Purpur start
 +        final ItemStack boat = new ItemStack(this.getDropItem());
 +        if (!this.level().purpurConfig.persistentDroppableEntityDisplayNames) {
-+            boat.set(DataComponents.CUSTOM_NAME, null);
+            boat.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, null);
 +        }
 +        return boat;
 +        // Purpur end
--- a/patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -73,7 +73,7 @@ index 2ade08d1466660ee1787fa97908002ef56389712..4fa4ec34963730507253182cad1c2bf0
                             if (itemstack.isEmpty()) {
                                 inventorysubcontainer.setItem(j, ItemStack.EMPTY);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java b/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
-index 8508ac7de8cda3127b73e11ff4aee62502e65ead..973518f939f5cd1b57589cbbbb01f199e5ebe73c 100644
+index 8508ac7de8cda3127b73e11ff4aee62502e65ead..b1544e028d5a9b84b944e1fb5a12bb163067fb54 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
@@ -59,6 +59,12 @@ public class TradeWithVillager extends Behavior<Villager> {
@@ -81,7 +81,7 @@ index 8508ac7de8cda3127b73e11ff4aee62502e65ead..973518f939f5cd1b57589cbbbb01f199
             }
 
 +            // Purpur start
-+            if (world.purpurConfig.villagerClericsFarmWarts && world.purpurConfig.villagerClericFarmersThrowWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC && entity.getInventory().countItem(Items.NETHER_WART) > Items.NETHER_WART.getMaxStackSize() / 2) {
+            if (world.purpurConfig.villagerClericsFarmWarts && world.purpurConfig.villagerClericFarmersThrowWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC && entity.getInventory().countItem(Items.NETHER_WART) > Items.NETHER_WART.getDefaultMaxStackSize() / 2) {
 +                throwHalfStack(entity, ImmutableSet.of(Items.NETHER_WART), villager);
 +            }
 +            // Purpur end
--- a/patches/server/0114-Implement-TPSBar.patch
+++ b/patches/server/0114-Implement-TPSBar.patch
@@ -41,7 +41,7 @@ index 6d47aa73788eef78aa6714384db879b4e907de9b..8a132fcdeb620d2e7f1c0c8b9e592ff2
         }
     }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..fabce29a8e4eefede38dabd009c0ab9f9c1dc842 100644
+index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..4077269113e6f2369194e2372d415f2f6737317c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -299,6 +299,7 @@ public class ServerPlayer extends Player {
@@ -60,15 +60,7 @@ index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..fabce29a8e4eefede38dabd009c0ab9f
     }
 
     // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -1182,6 +1184,7 @@ public class ServerPlayer extends Player {
-             }
-         }
- 
-+        if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
-     }
- 
-     @Override
-@@ -2986,5 +2989,13 @@ public class ServerPlayer extends Player {
+@@ -2986,5 +2988,13 @@ public class ServerPlayer extends Player {
             this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
         }
     }
--- a/patches/server/0116-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0116-PlayerBookTooLargeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e467ad2abcc32d86821ee3f99c82460095b40fba..9274a9eb5597a84519dd81367fa6f42a20d7e56c 100644
+index e467ad2abcc32d86821ee3f99c82460095b40fba..d58520d7c4da02eafc91571ca262430929a37cc0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1183,10 +1183,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -13,7 +13,7 @@ index e467ad2abcc32d86821ee3f99c82460095b40fba..9274a9eb5597a84519dd81367fa6f42a
             double multiplier = Math.max(0.3D, Math.min(1D, io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier));
             long byteAllowed = maxBookPageSize;
 +            // Purpur start
-+            int slot = packet.getSlot();
+            int slot = packet.slot();
 +            ItemStack itemstack = Inventory.isHotbarSlot(slot) || slot == Inventory.SLOT_OFFHAND ? this.player.getInventory().getItem(slot) : ItemStack.EMPTY;
 +            // Purpur end
             for (String testString : pageList) {
--- a/patches/server/0121-Farmland-trampling-changes.patch
+++ b/patches/server/0121-Farmland-trampling-changes.patch
@@ -12,7 +12,7 @@ necessary to trample in the first place. Feather Falling 1 requires
 you to fall over 3+ blocks to trample. FF 2 requires 4+, etc.

 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 99798220b6e0ad06db2ba5c9b74bfb72af185fee..6b12864f323202a1202a59f66412b3d5be28023f 100644
+index 99798220b6e0ad06db2ba5c9b74bfb72af185fee..12a0c69f8fec30fad64cbb00af2ca1bbf0ea5153 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -126,12 +126,20 @@ public class FarmBlock extends Block {
@@ -28,8 +28,8 @@ index 99798220b6e0ad06db2ba5c9b74bfb72af185fee..6b12864f323202a1202a59f66412b3d5
                 }
             }
 +            if (world.purpurConfig.farmlandTramplingFeatherFalling) {
-+                Iterator<net.minecraft.world.item.ItemStack> armor = entity.getArmorSlots().iterator();
-+                if (armor.hasNext() && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FALL_PROTECTION, armor.next()) >= (int) entity.fallDistance) {
+                Iterator<net.minecraft.world.item.ItemStack> armor = ((LivingEntity) entity).getArmorSlots().iterator();
+                if (armor.hasNext() && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FEATHER_FALLING, armor.next()) >= (int) entity.fallDistance) {
 +                    return;
 +                }
 +            }
--- a/patches/server/0123-Fix-stuck-in-portals.patch
+++ b/patches/server/0123-Fix-stuck-in-portals.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fabce29a8e4eefede38dabd009c0ab9f9c1dc842..9bf6457ed689d38393c17732dc9229d9fc297584 100644
+index 4077269113e6f2369194e2372d415f2f6737317c..c8f5c10952a8bf09a09604e76f7e3cc66a262b77 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1348,6 +1348,7 @@ public class ServerPlayer extends Player {
+@@ -1347,6 +1347,7 @@ public class ServerPlayer extends Player {
                 playerlist.sendPlayerPermissionLevel(this);
                 worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                 this.unsetRemoved();
--- a/patches/server/0128-Dont-run-with-scissors.patch
+++ b/patches/server/0128-Dont-run-with-scissors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9274a9eb5597a84519dd81367fa6f42a20d7e56c..fea36f5e4f64281459d62f4a6a4a7dd129706150 100644
+index d58520d7c4da02eafc91571ca262430929a37cc0..939234ccd803f173afe74651a92ff3a1c5b29b85 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1633,6 +1633,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -22,14 +22,16 @@ index 9274a9eb5597a84519dd81367fa6f42a20d7e56c..fea36f5e4f64281459d62f4a6a4a7dd1
                                 this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
                                 this.lastGoodX = this.player.getX();
                                 this.lastGoodY = this.player.getY();
-@@ -1672,6 +1679,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1672,6 +1679,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
         return false;
     }
     // Paper end - optimise out extra getCubes
 +
 +    // Purpur start
 +    public boolean isScissor(ItemStack stack) {
-+        return stack.is(Items.SHEARS) && (stack.getTag() == null || stack.getTag().getInt("CustomModelData") == 0);
+        if (!stack.is(Items.SHEARS)) return false;
+        net.minecraft.world.item.component.CustomModelData customModelData = stack.get(net.minecraft.core.component.DataComponents.CUSTOM_MODEL_DATA);
+        return customModelData == null || customModelData.value() == 0;
 +    }
 +    // Purpur end
 +
--- a/patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9bf6457ed689d38393c17732dc9229d9fc297584..0957b0fba3ffbc3571e5aef7eb2b550dab19c0cf 100644
+index c8f5c10952a8bf09a09604e76f7e3cc66a262b77..0da3b7bb3b597002b5e4bbc9d892a8bf4d2d6ccb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1505,7 +1505,7 @@ public class ServerPlayer extends Player {
+@@ -1504,7 +1504,7 @@ public class ServerPlayer extends Player {
                             return entitymonster.isPreventingPlayerRest(this);
                         });
 
--- a/patches/server/0139-Sneak-to-bulk-process-composter.patch
+++ b/patches/server/0139-Sneak-to-bulk-process-composter.patch
@@ -18,72 +18,74 @@ index 5cedce1f432f6b809b25269242a16477682c824f..61ff2f6c09251da8c34fd653020cd4d3
 
                 if (iteminteractionresult.consumesAction()) {
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index d3d12f9114173f4971f95d7ef895a4374705bd3f..750c9043c2b70b18fb34df1e856e3cbb6c651770 100644
+index d3d12f9114173f4971f95d7ef895a4374705bd3f..f34159f8d6c51af2341bf49db0d6d6f0417919cf 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -238,16 +238,26 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -237,18 +237,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+         int i = (Integer) state.getValue(ComposterBlock.LEVEL);
 
         if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
-             if (i < 7 && !world.isClientSide) {
+-            if (i < 7 && !world.isClientSide) {
 -                BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
 -                // Paper start - handle cancelled events
 -                if (iblockdata1 == null) {
-+    // Purpur start
-+                BlockState newState = process(stack, state, world, pos, player, i);
-+                if (newState == null) {
-                     return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
-                 }
+-                    return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
+-                }
 -                // Paper end
 -
 -                world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
 -                player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
 -                stack.consume(1, player);
-+                if (world.purpurConfig.composterBulkProcess && player.isShiftKeyDown()) {
-+                    BlockState oldState;
-+                    int oldCount, newCount, oldLevel, newLevel;
-+                    do {
-+                        oldState = newState;
-+                        newState = process(stack, state, world, pos, player, i);
-+                        oldCount = stack.getCount();
-+                        if (newState == null) {
-+                            return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
-+                        }
-+                        oldLevel = oldState.getValue(ComposterBlock.LEVEL);
-+                        newCount = stack.getCount();
-+                        newLevel = newState.getValue(ComposterBlock.LEVEL);
-+                    } while (newCount > 0 && (newCount != oldCount || newLevel != oldLevel || newState != oldState));
-+                }
+            // Purpur start - sneak to bulk process composter
+            BlockState newState = process(i, player, state, world, pos, stack);
+            if (newState == null) {
+                return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
             }
+            if (world.purpurConfig.composterBulkProcess && player.isShiftKeyDown() && newState != state) {
+                BlockState oldState;
+                int oldCount, newCount, oldLevel, newLevel;
+                do {
+                    oldState = newState;
+                    oldCount = stack.getCount();
+                    oldLevel = oldState.getValue(ComposterBlock.LEVEL);
+                    newState = process(oldLevel, player, oldState, world, pos, stack);
+                    if (newState == null) {
+                        return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
+                    }
+                    newCount = stack.getCount();
+                    newLevel = newState.getValue(ComposterBlock.LEVEL);
+                } while (newCount > 0 && (newCount != oldCount || newLevel != oldLevel || newState != oldState));
+            }
+            // Purpur end
 
             return ItemInteractionResult.sidedSuccess(world.isClientSide);
-@@ -255,6 +265,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-             return super.useItemOn(stack, state, world, pos, player, hand, hit);
+         } else {
+@@ -256,6 +265,25 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         }
     }
-+    private static BlockState process(ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, int i) {
-+    // Purpur end
-+                BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
-+                // Paper start - handle cancelled events
-+                if (iblockdata1 == null) {
-+                    return null; // Purpur
-+                }
-+                // Paper end
-+
-+                world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
-+                player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
-+                stack.consume(1, player);
-+    // Purpur start
-+    //         }
-+    //
-+    //         return ItemInteractionResult.sidedSuccess(world.isClientSide);
-+    //     } else {
-+    //         return super.useItemOn(stack, state, world, pos, player, hand, hit);
-+    //     }
-+    // }
-+    // Purpur end
 
+    // Purpur start - sneak to bulk process composter
+    private static @Nullable BlockState process(int level, Player player, BlockState state, Level world, BlockPos pos, ItemStack stack) {
+        if (level < 7 && !world.isClientSide) {
+            BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
+            // Paper start - handle cancelled events
+            if (iblockdata1 == null) {
+                return null;
+            }
+            // Paper end
+
+            world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
+            player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
+            stack.consume(1, player);
+            return iblockdata1;
+        }
+        return state;
+    }
+    // Purpur end
+
     @Override
     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
+         int i = (Integer) state.getValue(ComposterBlock.LEVEL);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 index cc365ef1a435c05639e1261bc349df3517e4a44b..5739e18827d77dc594894f7cf8d7ceb9f7b83df1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
--- a/patches/server/0142-Allow-infinity-on-crossbows.patch
+++ b/patches/server/0142-Allow-infinity-on-crossbows.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow infinity on crossbows


 diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index 0f6504a7160bc304b3af554f8740c65e2987cd37..a3614405a92f26f19fb1df24f685cb7c081333db 100644
+index 0f6504a7160bc304b3af554f8740c65e2987cd37..dccad13405f2ea4d277ec9a56813f4b36106c0f1 100644
 --- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
 +++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
@@ -107,7 +107,7 @@ public class CrossbowItem extends ProjectileWeaponItem {
@@ -13,7 +13,7 @@ index 0f6504a7160bc304b3af554f8740c65e2987cd37..a3614405a92f26f19fb1df24f685cb7c
     }
     private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow, boolean consume) {
 -        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, consume);
-+        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, (org.purpurmc.purpur.PurpurConfig.allowCrossbowInfinity && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, crossbow) > 0) || consume);
+        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, (org.purpurmc.purpur.PurpurConfig.allowCrossbowInfinity && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY, crossbow) > 0) || consume);
         // Paper end - Add EntityLoadCrossbowEvent
         if (!list.isEmpty()) {
             crossbow.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.of(list));
--- a/patches/server/0166-Config-for-unverified-username-message.patch
+++ b/patches/server/0166-Config-for-unverified-username-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for unverified username message


 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 765cf12c1558afd9686793b18388fc229c55d2d8..ad674e1be146614ba20e1f184b0f5cc30339593e 100644
+index b656741eb68adeb04bf995f1045902cb6bd5f2e7..3b4fadb37eafb2f7b0ce4d6b276d2fdaa8287521 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -309,7 +309,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -315,7 +315,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 {
--- a/patches/server/0185-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0185-Customizable-sleeping-actionbar-messages.patch
@@ -38,10 +38,10 @@ index 1dc58b41d3963c2adc58e79cd6db7e146ac049ad..83ec2e31d81d6209953252a3780552c3
                 }
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 397448063fb770f736f9c8bb7061852d3212484d..15dc4691ce604fd7f32b635590b32f4afec8bf2a 100644
+index 65d6ca59fca1ece4c2867bc297c926e3c480cc06..2480f449d8ceeb9ac6ef55163d8e649271f5c1c0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1546,7 +1546,19 @@ public class ServerPlayer extends Player {
+@@ -1545,7 +1545,19 @@ public class ServerPlayer extends Player {
                     });
 
                     if (!this.serverLevel().canSleepThroughNights()) {
--- a/patches/server/0190-Add-compass-command.patch
+++ b/patches/server/0190-Add-compass-command.patch
@@ -17,7 +17,7 @@ index 26c9254cef922a78deac3053f93c60037f19d31f..67ec90a2a05269a5912b3c8e64d6d416
 
         if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 15dc4691ce604fd7f32b635590b32f4afec8bf2a..670aa56c1b7c9e5fabda45b6a048a6cf6084a7d0 100644
+index 2480f449d8ceeb9ac6ef55163d8e649271f5c1c0..120a42a6057a9639b66be39099715a8bad1e06b5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -300,6 +300,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index 15dc4691ce604fd7f32b635590b32f4afec8bf2a..670aa56c1b7c9e5fabda45b6a048a6cf
     }
 
     // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -3011,5 +3015,13 @@ public class ServerPlayer extends Player {
+@@ -3010,5 +3014,13 @@ public class ServerPlayer extends Player {
     public void tpsBar(boolean tpsBar) {
         this.tpsBar = tpsBar;
     }
--- a/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch
@@ -36,10 +36,10 @@ index a810eaa7dc319f5ea69b239190ae91838bfad4ec..6d194797d8fe2cd6e5652d596f4bc66f
 +    // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fea36f5e4f64281459d62f4a6a4a7dd129706150..7c96644ee70ea061a5eb29809c2c5cc1bf55e194 100644
+index 939234ccd803f173afe74651a92ff3a1c5b29b85..395ad65503c87250c0e2fa8112208f26fd3681be 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2034,6 +2034,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2036,6 +2036,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
             boolean cancelled;
             if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
--- a/patches/server/0217-Signs-allow-color-codes.patch
+++ b/patches/server/0217-Signs-allow-color-codes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 670aa56c1b7c9e5fabda45b6a048a6cf6084a7d0..85f58f5449ee63a7f592971769b497e521921fcc 100644
+index 120a42a6057a9639b66be39099715a8bad1e06b5..4c603f774931b9d144420a115ad324bcb2eae26e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1684,6 +1684,7 @@ public class ServerPlayer extends Player {
+@@ -1683,6 +1683,7 @@ public class ServerPlayer extends Player {
 
     @Override
     public void openTextEdit(SignBlockEntity sign, boolean front) {
--- a/patches/server/0225-Configurable-valid-characters-for-usernames.patch
+++ b/patches/server/0225-Configurable-valid-characters-for-usernames.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Configurable valid characters for usernames


 diff --git a/src/main/java/net/minecraft/util/StringUtil.java b/src/main/java/net/minecraft/util/StringUtil.java
-index ae7ef47446c15b8a6878dd2d31b60cd0670eaf83..118841518668c82f0031ec97fd89819a06f72c6b 100644
+index 0bd191acb9596d3aa21c337230d26f09d26f6888..20211f40aeeade9217ece087688974bdf55afc56 100644
 --- a/src/main/java/net/minecraft/util/StringUtil.java
 +++ b/src/main/java/net/minecraft/util/StringUtil.java
-@@ -64,6 +64,7 @@ public class StringUtil {
-     }
+@@ -69,6 +69,7 @@ public class StringUtil {
 
-     public static boolean isValidPlayerName(String name) {
+     // Paper start - Username validation
+     public static boolean isReasonablePlayerName(final String name) {
 +        if (true) return org.purpurmc.purpur.PurpurConfig.usernameValidCharactersPattern.matcher(name).matches(); // Purpur
-         // Paper start - username validation overriding
-         if (name == null || name.isEmpty() || name.length() > 16) {
+         if (name.isEmpty() || name.length() > 16) {
             return false;
+         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 index a1fa16fca204098fd2211a4c206299356fc97724..107852247029b748a3e6e17b0ddbecdb50ce6d29 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
--- a/patches/server/0226-Shears-can-have-looting-enchantment.patch
+++ b/patches/server/0226-Shears-can-have-looting-enchantment.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shears can have looting enchantment


 diff --git a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
-index a024c697a65bbab27408da1d6a75e531d9719b47..64bbb3da8a75a90d85cdd3ac90a95c670ee032ae 100644
+index a024c697a65bbab27408da1d6a75e531d9719b47..e4fab82b369f2c2ea0d8c8acd814d06140d551fc 100644
 --- a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
@@ -105,7 +105,7 @@ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
@@ -13,7 +13,7 @@ index a024c697a65bbab27408da1d6a75e531d9719b47..64bbb3da8a75a90d85cdd3ac90a95c67
                     // CraftBukkit start
                     // Paper start - Add drops to shear events
 -                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops());
-+                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.MOB_LOOTING, CraftItemStack.asNMSCopy(craftItem)))); // Purpur
+                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.LOOTING, CraftItemStack.asNMSCopy(craftItem)))); // Purpur
                     if (event.isCancelled()) {
                         // Paper end - Add drops to shear events
                         continue;
--- a/patches/server/0239-Anvil-repair-damage-options.patch
+++ b/patches/server/0239-Anvil-repair-damage-options.patch
@@ -5,64 +5,63 @@ Subject: [PATCH] Anvil repair/damage options


 diff --git a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-index 923357251ad950ec4f893e8771fcfa99de8a60c5..9273db1b30398b3d170df562dfeff040c2b14a92 100644
+index 923357251ad950ec4f893e8771fcfa99de8a60c5..78a341ac80806f86f2ca0bd895fb091a9257519e 100644
 --- a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-@@ -61,6 +61,54 @@ public class AnvilBlock extends FallingBlock {
+@@ -59,6 +59,53 @@ public class AnvilBlock extends FallingBlock {
+         return this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getClockWise());
+     }
 
+    // Purpur start - repairable/damageable anvils
+    @Override
+    protected net.minecraft.world.ItemInteractionResult useItemOn(final net.minecraft.world.item.ItemStack stack, final BlockState state, final Level world, final BlockPos pos, final Player player, final net.minecraft.world.InteractionHand hand, final BlockHitResult hit) {
+        if (world.purpurConfig.anvilRepairIngotsAmount > 0 && stack.is(net.minecraft.world.item.Items.IRON_INGOT)) {
+            if (stack.getCount() < world.purpurConfig.anvilRepairIngotsAmount) {
+                // not enough iron ingots, play "error" sound and consume
+                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
+                return net.minecraft.world.ItemInteractionResult.CONSUME;
+            }
+            if (state.is(Blocks.DAMAGED_ANVIL)) {
+                world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
+            } else if (state.is(Blocks.CHIPPED_ANVIL)) {
+                world.setBlock(pos, Blocks.ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
+            } else if (state.is(Blocks.ANVIL)) {
+                // anvil is already fully repaired, play "error" sound and consume
+                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
+                return net.minecraft.world.ItemInteractionResult.CONSUME;
+            }
+            if (!player.getAbilities().instabuild) {
+                stack.shrink(world.purpurConfig.anvilRepairIngotsAmount);
+            }
+            world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_PLACE, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
+            return net.minecraft.world.ItemInteractionResult.CONSUME;
+        }
+        if (world.purpurConfig.anvilDamageObsidianAmount > 0 && stack.is(net.minecraft.world.item.Items.OBSIDIAN)) {
+            if (stack.getCount() < world.purpurConfig.anvilDamageObsidianAmount) {
+                // not enough obsidian, play "error" sound and consume
+                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
+                return net.minecraft.world.ItemInteractionResult.CONSUME;
+            }
+            if (state.is(Blocks.DAMAGED_ANVIL)) {
+                world.destroyBlock(pos, false);
+            } else if (state.is(Blocks.CHIPPED_ANVIL)) {
+                world.setBlock(pos, Blocks.DAMAGED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
+            } else if (state.is(Blocks.ANVIL)) {
+                world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
+            }
+            if (!player.getAbilities().instabuild) {
+                stack.shrink(world.purpurConfig.anvilDamageObsidianAmount);
+            }
+            world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_LAND, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
+            return net.minecraft.world.ItemInteractionResult.CONSUME;
+        }
+        return net.minecraft.world.ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
+    }
+    // Purpur end
+
     @Override
     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-+        // Purpur start - repairable/damageable anvils
-+        if (world.purpurConfig.anvilRepairIngotsAmount > 0) {
-+            net.minecraft.world.item.ItemStack itemstack = player.getItemInHand(hand);
-+            if (itemstack.is(net.minecraft.world.item.Items.IRON_INGOT)) {
-+                if (itemstack.getCount() < world.purpurConfig.anvilRepairIngotsAmount) {
-+                    // not enough iron ingots, play "error" sound and consume
-+                    world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                    return InteractionResult.CONSUME;
-+                }
-+                if (state.is(Blocks.DAMAGED_ANVIL)) {
-+                    world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                } else if (state.is(Blocks.CHIPPED_ANVIL)) {
-+                    world.setBlock(pos, Blocks.ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                } else if (state.is(Blocks.ANVIL)) {
-+                    // anvil is already fully repaired, play "error" sound and consume
-+                    world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                    return InteractionResult.CONSUME;
-+                }
-+                if (!player.getAbilities().instabuild) {
-+                    itemstack.shrink(world.purpurConfig.anvilRepairIngotsAmount);
-+                }
-+                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_PLACE, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                return InteractionResult.CONSUME;
-+            }
-+        }
-+        if (world.purpurConfig.anvilDamageObsidianAmount > 0) {
-+            net.minecraft.world.item.ItemStack itemstack = player.getItemInHand(hand);
-+            if (itemstack.is(net.minecraft.world.item.Items.OBSIDIAN)) {
-+                if (itemstack.getCount() < world.purpurConfig.anvilDamageObsidianAmount) {
-+                    // not enough obsidian, play "error" sound and consume
-+                    world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                    return InteractionResult.CONSUME;
-+                }
-+                if (state.is(Blocks.DAMAGED_ANVIL)) {
-+                    world.destroyBlock(pos, false);
-+                } else if (state.is(Blocks.CHIPPED_ANVIL)) {
-+                    world.setBlock(pos, Blocks.DAMAGED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                } else if (state.is(Blocks.ANVIL)) {
-+                    world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                }
-+                if (!player.getAbilities().instabuild) {
-+                    itemstack.shrink(world.purpurConfig.anvilDamageObsidianAmount);
-+                }
-+                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_LAND, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                return InteractionResult.CONSUME;
-+            }
-+        }
-+        // Purpur end
         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-         } else {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 index 2b5475c0032171fec4a5e8a7b435168c5b95b17b..d00d9068134957fb76740e94e7cce055d8ea9f43 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
--- a/patches/server/0240-Option-to-disable-turtle-egg-trampling-with-feather-.patch
+++ b/patches/server/0240-Option-to-disable-turtle-egg-trampling-with-feather-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable turtle egg trampling with feather falling


 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 2f0e8aeb9c45853fca12ddd78a7d51813a600e67..c3df410f692219ef166a8b885980b23a2c79950d 100644
+index 2f0e8aeb9c45853fca12ddd78a7d51813a600e67..08ba90f760abb9fb62311dddd7b5bdbd0d9518d7 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
@@ -219,7 +219,13 @@ public class TurtleEggBlock extends Block {
@@ -14,8 +14,8 @@ index 2f0e8aeb9c45853fca12ddd78a7d51813a600e67..c3df410f692219ef166a8b885980b23a
         }
 -        if (entity instanceof Player) return true;
 +        if (world.purpurConfig.turtleEggsTramplingFeatherFalling) {
-+            java.util.Iterator<ItemStack> armor = entity.getArmorSlots().iterator();
-+            return !armor.hasNext() || net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FALL_PROTECTION, armor.next()) < (int) entity.fallDistance;
+            java.util.Iterator<ItemStack> armor = ((LivingEntity) entity).getArmorSlots().iterator();
+            return !armor.hasNext() || net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FEATHER_FALLING, armor.next()) < (int) entity.fallDistance;
 +        }
 +        if (entity instanceof Player) {
 +            return true;
--- a/patches/server/0248-Enchantment-Table-Persists-Lapis.patch
+++ b/patches/server/0248-Enchantment-Table-Persists-Lapis.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enchantment Table Persists Lapis


 diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-index 5b3e33807e0e13480e3359c0cf067719e5749237..8a7cb30524c75d155c27571e32da6511e265cbf4 100644
+index 5b3e33807e0e13480e3359c0cf067719e5749237..c3a644b0f8c7c5622acc9e1a496f95d432718806 100644
 --- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
@@ -38,6 +38,12 @@ import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
@@ -14,7 +14,7 @@ index 5b3e33807e0e13480e3359c0cf067719e5749237..8a7cb30524c75d155c27571e32da6511
 
 +// Purpur start
 +import net.minecraft.world.level.block.entity.BlockEntity;
-+import net.minecraft.world.level.block.entity.EnchantmentTableBlockEntity;
+import net.minecraft.world.level.block.entity.EnchantingTableBlockEntity;
 +import org.bukkit.craftbukkit.entity.CraftHumanEntity;
 +// Purpur end
 +
@@ -34,7 +34,7 @@ index 5b3e33807e0e13480e3359c0cf067719e5749237..8a7cb30524c75d155c27571e32da6511
 +                if (who.getHandle().level().purpurConfig.enchantmentTableLapisPersists) {
 +                    access.execute((level, pos) -> {
 +                        BlockEntity blockEntity = level.getBlockEntity(pos);
-+                        if (blockEntity instanceof EnchantmentTableBlockEntity enchantmentTable) {
+                        if (blockEntity instanceof EnchantingTableBlockEntity enchantmentTable) {
 +                            enchantmentTable.setLapis(this.getItem(1).getCount());
 +                        }
 +                    });
@@ -52,7 +52,7 @@ index 5b3e33807e0e13480e3359c0cf067719e5749237..8a7cb30524c75d155c27571e32da6511
 +        access.execute((level, pos) -> {
 +            if (level.purpurConfig.enchantmentTableLapisPersists) {
 +                BlockEntity blockEntity = level.getBlockEntity(pos);
-+                if (blockEntity instanceof EnchantmentTableBlockEntity enchantmentTable) {
+                if (blockEntity instanceof EnchantingTableBlockEntity enchantmentTable) {
 +                    this.getSlot(1).set(new ItemStack(Items.LAPIS_LAZULI, enchantmentTable.getLapis()));
 +                }
 +            }
--- a/patches/server/0250-Option-to-disable-kick-for-out-of-order-chat.patch
+++ b/patches/server/0250-Option-to-disable-kick-for-out-of-order-chat.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable kick for out of order chat


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7c96644ee70ea061a5eb29809c2c5cc1bf55e194..530421935473693681819073e1ce9a52cb275775 100644
+index 395ad65503c87250c0e2fa8112208f26fd3681be..7b28ec1c6d87bad32b46c6ac6cf9e97d06ccedf9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1696,7 +1696,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1698,7 +1698,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
         do {
             if (!iterator.hasNext()) {
--- a/patches/server/0256-Remove-Timings.patch
+++ b/patches/server/0256-Remove-Timings.patch
@@ -632,10 +632,10 @@ index ae2b9732b2795ea7faec96af4c27ccb04f772307..a84a9218838fb42c49a00c0d5f28e9e4
 
         } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 530421935473693681819073e1ce9a52cb275775..5ae8b009e5ba2fc896e7f52b864aecafe4e892d4 100644
+index 7b28ec1c6d87bad32b46c6ac6cf9e97d06ccedf9..0b36f161f10bbc0a4afefe28b80ef1de1ef16b3b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2509,7 +2509,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2511,7 +2511,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
     public void handleCommand(String s) { // Paper - private -> public
         org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
@@ -644,7 +644,7 @@ index 530421935473693681819073e1ce9a52cb275775..5ae8b009e5ba2fc896e7f52b864aecaf
         if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
         this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
 
-@@ -2519,7 +2519,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2521,7 +2521,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
         this.cserver.getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
@@ -653,7 +653,7 @@ index 530421935473693681819073e1ce9a52cb275775..5ae8b009e5ba2fc896e7f52b864aecaf
             return;
         }
 
-@@ -2532,7 +2532,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2534,7 +2534,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
             java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
             return;
         } finally {
--- a/patches/server/0257-Remove-Mojang-Profiler.patch
+++ b/patches/server/0257-Remove-Mojang-Profiler.patch
@@ -826,10 +826,10 @@ index a84a9218838fb42c49a00c0d5f28e9e486fc7dac..f72af2feb74626abbdfbfd090c153574
 
                 while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 85f58f5449ee63a7f592971769b497e521921fcc..054a8aff30181d1a568ad931eb150fc2992cac97 100644
+index 4c603f774931b9d144420a115ad324bcb2eae26e..93aac363b21d695f266c66ec58f4ac8d17d61611 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1318,7 +1318,7 @@ public class ServerPlayer extends Player {
+@@ -1317,7 +1317,7 @@ public class ServerPlayer extends Player {
             PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
 
             if (shapedetectorshape != null) {
@@ -838,7 +838,7 @@ index 85f58f5449ee63a7f592971769b497e521921fcc..054a8aff30181d1a568ad931eb150fc2
                 worldserver = shapedetectorshape.world; // CraftBukkit
                 if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
                 if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
-@@ -1341,8 +1341,8 @@ public class ServerPlayer extends Player {
+@@ -1340,8 +1340,8 @@ public class ServerPlayer extends Player {
             worldserver = ((CraftWorld) exit.getWorld()).getHandle();
             // CraftBukkit end
 
@@ -849,7 +849,7 @@ index 85f58f5449ee63a7f592971769b497e521921fcc..054a8aff30181d1a568ad931eb150fc2
             if (true) { // CraftBukkit
                 this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
 
-@@ -1360,7 +1360,7 @@ public class ServerPlayer extends Player {
+@@ -1359,7 +1359,7 @@ public class ServerPlayer extends Player {
                 this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                 this.connection.resetPosition();
                 worldserver.addDuringPortalTeleport(this);
--- a/patches/server/0265-Implement-ram-and-rambar-commands.patch
+++ b/patches/server/0265-Implement-ram-and-rambar-commands.patch
@@ -18,7 +18,7 @@ index d3c42c19a051fb3a670e541fc746b55717192a91..13dfb3e506d50c0b191baf5d05bbfc28
 
         if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 054a8aff30181d1a568ad931eb150fc2992cac97..4404380383e9e78a70c4195dbb49aff76515441a 100644
+index 93aac363b21d695f266c66ec58f4ac8d17d61611..b4eaa50add793af326bdf19e98cc97f6b88d5496 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -301,6 +301,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index 054a8aff30181d1a568ad931eb150fc2992cac97..4404380383e9e78a70c4195dbb49aff7
         nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
         nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
     }
-@@ -3024,5 +3027,13 @@ public class ServerPlayer extends Player {
+@@ -3023,5 +3026,13 @@ public class ServerPlayer extends Player {
     public void compassBar(boolean compassBar) {
         this.compassBar = compassBar;
     }
--- a/patches/server/0269-Milk-Keeps-Beneficial-Effects.patch
+++ b/patches/server/0269-Milk-Keeps-Beneficial-Effects.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Milk Keeps Beneficial Effects


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index def30f8c79a4244116f1b9d9ae1a9d06d0a38bce..319e33285b9ba1c65bab9cf2266a15aa0f24d002 100644
+index def30f8c79a4244116f1b9d9ae1a9d06d0a38bce..1f0b8e10e03a1c0aea99768d714325effd04861e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1154,6 +1154,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             for (flag = false; iterator.hasNext(); flag = true) {
                 // CraftBukkit start
                 MobEffectInstance effect = (MobEffectInstance) iterator.next();
-+                if (cause == EntityPotionEffectEvent.Cause.MILK && !this.level().purpurConfig.milkClearsBeneficialEffects && effect.getEffect().isBeneficial()) continue; // Purpur
+                if (cause == EntityPotionEffectEvent.Cause.MILK && !this.level().purpurConfig.milkClearsBeneficialEffects && effect.getEffect().value().isBeneficial()) continue; // Purpur
                 EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
                 if (event.isCancelled()) {
                     continue;
--- a/patches/server/0286-Shears-can-defuse-TNT.patch
+++ b/patches/server/0286-Shears-can-defuse-TNT.patch
@@ -8,7 +8,7 @@ Shears can now defuse TNT. Each world can have a configured chance for the TNT t
 By default the option is disabled to avoid breaking any possible vanilla mechanics.

 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index f1f352ec0e51f5db59254841a06c176c5a876fc9..ded6bacd7baf7e7c8aa225825c345aefd8d42aa9 100644
+index f1f352ec0e51f5db59254841a06c176c5a876fc9..dff0e7b08b973a1b29f916e63d3e4778d6c56cdc 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
@@ -193,4 +193,29 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -28,7 +28,7 @@ index f1f352ec0e51f5db59254841a06c176c5a876fc9..ded6bacd7baf7e7c8aa225825c345aef
 +                    new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.TNT));
 +            tntItem.setPickUpDelay(10);
 +
-+            inHand.hurtAndBreak(1, player, entity -> entity.broadcastBreakEvent(hand));
+            inHand.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand));
 +            level().addFreshEntity(tntItem, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CUSTOM);
 +
 +            this.playSound(net.minecraft.sounds.SoundEvents.SHEEP_SHEAR);
--- a/patches/server/0287-Explorer-Map-API.patch
+++ b/patches/server/0287-Explorer-Map-API.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Explorer Map API


 diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index ce461b1a8d7fab87ae28e30205f6fab67f1808b6..4704080612cb9d3f6338d158aba8078332b57c58 100644
+index ce461b1a8d7fab87ae28e30205f6fab67f1808b6..608390ed36710a419de1542b80340dd3fcc7299c 100644
 --- a/src/main/java/net/minecraft/world/item/MapItem.java
 +++ b/src/main/java/net/minecraft/world/item/MapItem.java
@@ -195,6 +195,7 @@ public class MapItem extends ComplexItem {
     public static void renderBiomePreviewMap(ServerLevel world, ItemStack map) {
         MapItemSavedData mapItemSavedData = getSavedData(map, world);
         if (mapItemSavedData != null) {
-+            worldmap.isExplorerMap = true; // Purpur
+            mapItemSavedData.isExplorerMap = true; // Purpur
             if (world.dimension() == mapItemSavedData.dimension) {
                 int i = 1 << mapItemSavedData.scale;
                 int j = mapItemSavedData.centerX;