50 patches done

2026-02-19 01:17:42 +01:00 · 2024-12-03 20:55:24 -08:00
parent 626d85327e
commit ceacfddaf9
41 changed files with 117 additions and 118 deletions
--- a/patches/unapplied-server/0010-Configurable-entity-base-attributes.patch
+++ b/patches/unapplied-server/0010-Configurable-entity-base-attributes.patch
--- a/patches/unapplied-server/0011-Barrels-and-enderchests-6-rows.patch
+++ b/patches/unapplied-server/0011-Barrels-and-enderchests-6-rows.patch
@@ -1,298 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 23 May 2019 21:50:37 -0500
-Subject: [PATCH] Barrels and enderchests 6 rows
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf8b7f93a1ba027c00d7f45809fa51f1ab55a5de..595302e0177824c1e3ad54e9a088337eeb2d872b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1116,6 +1116,27 @@ public abstract class PlayerList {
-         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
-         this.server.getCommands().sendCommands(player);
-         } // Paper - Add sendOpLevel API
-+
-+        // Purpur start
-+        if (org.purpurmc.purpur.PurpurConfig.enderChestSixRows && org.purpurmc.purpur.PurpurConfig.enderChestPermissionRows) {
-+            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkit = player.getBukkitEntity();
-+            if (bukkit.hasPermission("purpur.enderchest.rows.six")) {
-+                player.sixRowEnderchestSlotCount = 54;
-+            } else if (bukkit.hasPermission("purpur.enderchest.rows.five")) {
-+                player.sixRowEnderchestSlotCount = 45;
-+            } else if (bukkit.hasPermission("purpur.enderchest.rows.four")) {
-+                player.sixRowEnderchestSlotCount = 36;
-+            } else if (bukkit.hasPermission("purpur.enderchest.rows.three")) {
-+                player.sixRowEnderchestSlotCount = 27;
-+            } else if (bukkit.hasPermission("purpur.enderchest.rows.two")) {
-+                player.sixRowEnderchestSlotCount = 18;
-+            } else if (bukkit.hasPermission("purpur.enderchest.rows.one")) {
-+                player.sixRowEnderchestSlotCount = 9;
-+            }
-+        } else {
-+            player.sixRowEnderchestSlotCount = -1;
-+        }
-+        //Purpur end
-     }
- 
-     public boolean isWhiteListed(GameProfile profile) {
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 21f85ffe12a6ac11a67c808e4878f9a46f01344e..7e9f9b1f9e932116fc12db9cc2c0135144156eda 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity {
-     private int currentImpulseContextResetGraceTime;
-     public boolean affectsSpawning = true; // Paper - Affects Spawning API
-     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
-+    public int sixRowEnderchestSlotCount = -1; // Purpur
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-diff --git a/src/main/java/net/minecraft/world/inventory/ChestMenu.java b/src/main/java/net/minecraft/world/inventory/ChestMenu.java
-index 48a6b6136ac3414ca735f93a14b1a8d76210603c..27321b07cd04814bc1ff720c65770d7755625bb6 100644
--- a/src/main/java/net/minecraft/world/inventory/ChestMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/ChestMenu.java
-@@ -66,10 +66,30 @@ public class ChestMenu extends AbstractContainerMenu {
-         return new ChestMenu(MenuType.GENERIC_9x6, syncId, playerInventory, 6);
-     }
- 
-+    // Purpur start
-+    public static ChestMenu oneRow(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x1, syncId, playerInventory, inventory, 1);
-+    }
-+
-+    public static ChestMenu twoRows(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x2, syncId, playerInventory, inventory, 2);
-+    }
-+    // Purpur end
-+
-     public static ChestMenu threeRows(int syncId, Inventory playerInventory, Container inventory) {
-         return new ChestMenu(MenuType.GENERIC_9x3, syncId, playerInventory, inventory, 3);
-     }
- 
-+    // Purpur start
-+    public static ChestMenu fourRows(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x4, syncId, playerInventory, inventory, 4);
-+    }
-+
-+    public static ChestMenu fiveRows(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x5, syncId, playerInventory, inventory, 5);
-+    }
-+    // Purpur end
-+
-     public static ChestMenu sixRows(int syncId, Inventory playerInventory, Container inventory) {
-         return new ChestMenu(MenuType.GENERIC_9x6, syncId, playerInventory, inventory, 6);
-     }
-diff --git a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-index a15d5ff872dbd77f3c3145e0328f3d02e431ff8c..1dcf36d502990d32fc4cd3ea69c3ea334baed69a 100644
--- a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-+++ b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-@@ -31,11 +31,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
-     }
- 
-     public PlayerEnderChestContainer(Player owner) {
-        super(27);
-+        super(org.purpurmc.purpur.PurpurConfig.enderChestSixRows ? 54 : 27); // Purpur
-         this.owner = owner;
-         // CraftBukkit end
-     }
- 
-+    // Purpur start
-+    @Override
-+    public int getContainerSize() {
-+        return owner.sixRowEnderchestSlotCount < 0 ? super.getContainerSize() : owner.sixRowEnderchestSlotCount;
-+    }
-+    // Purpur end
-+
-     public void setActiveChest(EnderChestBlockEntity blockEntity) {
-         this.activeChest = blockEntity;
-     }
-diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-index 2a207fb2e1c26b562de42240e11c856bd2a23458..6ad4aa371607ab92616626285a7e71757c76a3db 100644
--- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -89,7 +89,7 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
-                 // Paper start - Fix InventoryOpenEvent cancellation - moved up;
-                 playerEnderChestContainer.setActiveChest(enderChestBlockEntity); // Needs to happen before ChestMenu.threeRows as it is required for opening animations
-                 if (world instanceof ServerLevel serverLevel && player.openMenu(
-                    new SimpleMenuProvider((i, inventory, playerx) -> ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE)
-+                    new SimpleMenuProvider((i, inventory, playerx) -> org.purpurmc.purpur.PurpurConfig.enderChestSixRows ? getEnderChestSixRows(i, inventory, player, playerEnderChestContainer) : ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE) // Purpur
-                 ).isPresent()) {
-                 // Paper end - Fix InventoryOpenEvent cancellation - moved up;
-                     // Paper - Fix InventoryOpenEvent cancellation - moved up;
-@@ -104,6 +104,35 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
-         }
-     }
- 
-+    // Purpur start
-+    private ChestMenu getEnderChestSixRows(int syncId, net.minecraft.world.entity.player.Inventory inventory, Player player, PlayerEnderChestContainer playerEnderChestContainer) {
-+        if (org.purpurmc.purpur.PurpurConfig.enderChestPermissionRows) {
-+            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkitPlayer = player.getBukkitEntity();
-+            if (bukkitPlayer.hasPermission("purpur.enderchest.rows.six")) {
-+                player.sixRowEnderchestSlotCount = 54;
-+                return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
-+            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.five")) {
-+                player.sixRowEnderchestSlotCount = 45;
-+                return ChestMenu.fiveRows(syncId, inventory, playerEnderChestContainer);
-+            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.four")) {
-+                player.sixRowEnderchestSlotCount = 36;
-+                return ChestMenu.fourRows(syncId, inventory, playerEnderChestContainer);
-+            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.three")) {
-+                player.sixRowEnderchestSlotCount = 27;
-+                return ChestMenu.threeRows(syncId, inventory, playerEnderChestContainer);
-+            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.two")) {
-+                player.sixRowEnderchestSlotCount = 18;
-+                return ChestMenu.twoRows(syncId, inventory, playerEnderChestContainer);
-+            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.one")) {
-+                player.sixRowEnderchestSlotCount = 9;
-+                return ChestMenu.oneRow(syncId, inventory, playerEnderChestContainer);
-+            }
-+        }
-+        player.sixRowEnderchestSlotCount = -1;
-+        return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
-+    }
-+    // Purpur end
-+
-     @Override
-     public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
-         return new EnderChestBlockEntity(pos, state);
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index 618552afbdacc919c33b30a6bf4834fb71ab3d5b..7a059d20abdcc0073a314311d78f63ae4bd0365e 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -68,7 +68,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
- 
-     public BarrelBlockEntity(BlockPos pos, BlockState state) {
-         super(BlockEntityType.BARREL, pos, state);
-        this.items = NonNullList.withSize(27, ItemStack.EMPTY);
-+        // Purpur start
-+        this.items = NonNullList.withSize(switch (org.purpurmc.purpur.PurpurConfig.barrelRows) {
-+            case 6 -> 54;
-+            case 5 -> 45;
-+            case 4 -> 36;
-+            case 2 -> 18;
-+            case 1 -> 9;
-+            default -> 27;
-+        }, ItemStack.EMPTY);
-+        // Purpur end
-         this.openersCounter = new ContainerOpenersCounter() {
-             @Override
-             protected void onOpen(Level world, BlockPos pos, BlockState state) {
-@@ -119,7 +128,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
- 
-     @Override
-     public int getContainerSize() {
-        return 27;
-+        // Purpur start
-+        return switch (org.purpurmc.purpur.PurpurConfig.barrelRows) {
-+            case 6 -> 54;
-+            case 5 -> 45;
-+            case 4 -> 36;
-+            case 2 -> 18;
-+            case 1 -> 9;
-+            default -> 27;
-+        };
-+        // Purpur end
-     }
- 
-     @Override
-@@ -139,7 +157,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
- 
-     @Override
-     protected AbstractContainerMenu createMenu(int syncId, Inventory playerInventory) {
-        return ChestMenu.threeRows(syncId, playerInventory, this);
-+        // Purpur start
-+        return switch (org.purpurmc.purpur.PurpurConfig.barrelRows) {
-+            case 6 -> ChestMenu.sixRows(syncId, playerInventory, this);
-+            case 5 -> ChestMenu.fiveRows(syncId, playerInventory, this);
-+            case 4 -> ChestMenu.fourRows(syncId, playerInventory, this);
-+            case 2 -> ChestMenu.twoRows(syncId, playerInventory, this);
-+            case 1 -> ChestMenu.oneRow(syncId, playerInventory, this);
-+            default -> ChestMenu.threeRows(syncId, playerInventory, this);
-+        };
-+        // Purpur end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 6d3f9d5dab6c9a2860ae31cae24310aa2d62da7c..4f29c579f94efe59a8c78520d75676fc4875e2f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -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 ? 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(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 -> 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;
-             case DISPENSER:
-             case DROPPER:
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index af1ae3dacb628da23f7d2988c6e76d3fb2d64103..4ee2d501f882279b48edb4b8bf0824587c276bf6 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -84,7 +84,7 @@ public class CraftInventory implements Inventory {
- 
-     @Override
-     public void setContents(ItemStack[] items) {
-        Preconditions.checkArgument(items.length <= this.getSize(), "Invalid inventory size (%s); expected %s or less", items.length, this.getSize());
-+        // Preconditions.checkArgument(items.length <= this.getSize(), "Invalid inventory size (%s); expected %s or less", items.length, this.getSize()); // Purpur
- 
-         for (int i = 0; i < this.getSize(); i++) {
-             if (i >= items.length) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 09e7a11a241b6e306d5043fe66f14fd4f2aae963..a83117ed0a0c98d7ae18e925338b58930946c96a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -180,4 +180,39 @@ public class PurpurConfig {
-     private static void messages() {
-         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-     }
-+
-+    public static int barrelRows = 3;
-+    public static boolean enderChestSixRows = false;
-+    public static boolean enderChestPermissionRows = false;
-+    private static void blockSettings() {
-+        if (version < 3) {
-+            boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-+            set("settings.blocks.barrel.six-rows", oldValue);
-+            set("settings.packed-barrels", null);
-+            oldValue = getBoolean("settings.large-ender-chests", true);
-+            set("settings.blocks.ender_chest.six-rows", oldValue);
-+            set("settings.large-ender-chests", null);
-+        }
-+        if (version < 20) {
-+            boolean oldValue = getBoolean("settings.blocks.barrel.six-rows", false);
-+            set("settings.blocks.barrel.rows", oldValue ? 6 : 3);
-+            set("settings.blocks.barrel.six-rows", null);
-+        }
-+        barrelRows = getInt("settings.blocks.barrel.rows", barrelRows);
-+        if (barrelRows < 1 || barrelRows > 6) {
-+            Bukkit.getLogger().severe("settings.blocks.barrel.rows must be 1-6, resetting to default");
-+            barrelRows = 3;
-+        }
-+        org.bukkit.event.inventory.InventoryType.BARREL.setDefaultSize(switch (barrelRows) {
-+            case 6 -> 54;
-+            case 5 -> 45;
-+            case 4 -> 36;
-+            case 2 -> 18;
-+            case 1 -> 9;
-+            default -> 27;
-+        });
-+        enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
-+        org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
-+        enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
-+    }
- }
--- a/patches/unapplied-server/0012-Llama-API.patch
+++ b/patches/unapplied-server/0012-Llama-API.patch
@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 18 Oct 2019 22:50:12 -0500
-Subject: [PATCH] Llama API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-index df695b444fa2a993d381e2f197182c3e91a68502..eb0faf58fa1a408f294fc62120b140def97f998d 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-@@ -22,6 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
- 
-     @Override
-     public boolean canUse() {
-+        if (!this.llama.shouldJoinCaravan) return false; // Purpur
-         if (!this.llama.isLeashed() && !this.llama.inCaravan()) {
-             List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity -> {
-                 EntityType<?> entityType = entity.getType();
-@@ -71,6 +72,7 @@ public class LlamaFollowCaravanGoal extends Goal {
- 
-     @Override
-     public boolean canContinueToUse() {
-+        if (!this.llama.shouldJoinCaravan) return false; // Purpur
-         if (this.llama.inCaravan() && this.llama.getCaravanHead().isAlive() && this.firstIsLeashed(this.llama, 0)) {
-             double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
-             if (d > 676.0) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index f9774491bd49bb37d3581cebbcedfc1878cf15b5..4a412a8a582e092a920029791a48c085527cbbd0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -72,6 +72,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-     private Llama caravanHead;
-     @Nullable
-     public Llama caravanTail; // Paper
-+    public boolean shouldJoinCaravan = true; // Purpur
- 
-     public Llama(EntityType<? extends Llama> type, Level world) {
-         super(type, world);
-@@ -166,6 +167,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         super.addAdditionalSaveData(nbt);
-         nbt.putInt("Variant", this.getVariant().id);
-         nbt.putInt("Strength", this.getStrength());
-+        nbt.putBoolean("Purpur.ShouldJoinCaravan", shouldJoinCaravan); // Purpur
-     }
- 
-     @Override
-@@ -173,6 +175,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         this.setStrength(nbt.getInt("Strength"));
-         super.readAdditionalSaveData(nbt);
-         this.setVariant(Llama.Variant.byId(nbt.getInt("Variant")));
-+        if (nbt.contains("Purpur.ShouldJoinCaravan")) this.shouldJoinCaravan = nbt.getBoolean("Purpur.ShouldJoinCaravan"); // Purpur
-     }
- 
-     @Override
-@@ -440,6 +443,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
- 
-     public void leaveCaravan() {
-         if (this.caravanHead != null) {
-+            new org.purpurmc.purpur.event.entity.LlamaLeaveCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity()).callEvent(); // Purpur
-             this.caravanHead.caravanTail = null;
-         }
- 
-@@ -447,6 +451,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-     }
- 
-     public void joinCaravan(Llama llama) {
-+        if (!shouldJoinCaravan || !new org.purpurmc.purpur.event.entity.LlamaJoinCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity(), (org.bukkit.entity.Llama) llama.getBukkitEntity()).callEvent()) return; // Purpur
-         this.caravanHead = llama;
-         this.caravanHead.caravanTail = this;
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 351f42842b780d053cd2e5bad9ae299449141b10..4860574e7fad7a9527dda599703c573c5b4b234b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -90,4 +90,16 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
-         return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
-     }
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public boolean shouldJoinCaravan() {
-+        return getHandle().shouldJoinCaravan;
-+    }
-+
-+    @Override
-+    public void setShouldJoinCaravan(boolean shouldJoinCaravan) {
-+        getHandle().shouldJoinCaravan = shouldJoinCaravan;
-+    }
-+    // Purpur end
- }
--- a/patches/unapplied-server/0013-AFK-API.patch
+++ b/patches/unapplied-server/0013-AFK-API.patch
@@ -1,331 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 8 Aug 2019 15:29:15 -0500
-Subject: [PATCH] AFK API
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 749145ac5ee84b5ebbf4b1eba2df680c1c51bd88..d4ed1dd4e4c56cf40632b0857af82a944579da65 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2641,8 +2641,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
- 
-     public void resetLastActionTime() {
-         this.lastActionTime = Util.getMillis();
-+        this.setAfk(false); // Purpur
-     }
- 
-+    // Purpur Start
-+    private boolean isAfk = false;
-+
-+    @Override
-+    public void setAfk(boolean afk) {
-+        if (this.isAfk == afk) {
-+            return;
-+        }
-+
-+        String msg = afk ? org.purpurmc.purpur.PurpurConfig.afkBroadcastAway : org.purpurmc.purpur.PurpurConfig.afkBroadcastBack;
-+
-+        org.purpurmc.purpur.event.PlayerAFKEvent event = new org.purpurmc.purpur.event.PlayerAFKEvent(this.getBukkitEntity(), afk, this.level().purpurConfig.idleTimeoutKick, msg, !Bukkit.isPrimaryThread());
-+        if (!event.callEvent() || event.shouldKick()) {
-+            return;
-+        }
-+
-+        this.isAfk = afk;
-+
-+        if (!afk) {
-+            resetLastActionTime();
-+        }
-+
-+        msg = event.getBroadcastMsg();
-+        if (msg != null && !msg.isEmpty()) {
-+            String playerName = this.getGameProfile().getName();
-+            if (org.purpurmc.purpur.PurpurConfig.afkBroadcastUseDisplayName) {
-+                net.kyori.adventure.text.Component playerDisplayNameComponent = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(this.getBukkitEntity().getDisplayName());
-+                playerName = net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText().serialize(playerDisplayNameComponent);
-+            }
-+            server.getPlayerList().broadcastMiniMessage(String.format(msg, playerName), false);
-+        }
-+
-+        if (this.level().purpurConfig.idleTimeoutUpdateTabList) {
-+            String scoreboardName = getScoreboardName();
-+            String playerListName = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().serialize(getBukkitEntity().playerListName());
-+            String[] split = playerListName.split(scoreboardName);
-+            String prefix = (split.length > 0 ? split[0] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix, "");
-+            String suffix = (split.length > 1 ? split[1] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, "");
-+            if (afk) {
-+                getBukkitEntity().setPlayerListName(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix + prefix + scoreboardName + suffix + org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, true);
-+            } else {
-+                getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix, true);
-+            }
-+        }
-+
-+        ((ServerLevel) this.level()).updateSleepingPlayerList();
-+    }
-+
-+    @Override
-+    public boolean isAfk() {
-+        return this.isAfk;
-+    }
-+
-+    @Override
-+    public boolean canBeCollidedWith() {
-+        return !this.isAfk() && super.canBeCollidedWith();
-+    }
-+    // Purpur End
-+
-     public ServerStatsCounter getStats() {
-         return this.stats;
-     }
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d2145df4e9b0dd16e7d394b8983c36fd073d3e31..f48b13b9b57e3a25e8afeb37f54e883fd1cadf4d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -342,6 +342,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     private boolean justTeleported = false;
-     // CraftBukkit end
- 
-+        // Purpur start
-+    private final com.google.common.cache.LoadingCache<CraftPlayer, Boolean> kickPermissionCache = com.google.common.cache.CacheBuilder.newBuilder()
-+        .maximumSize(1000)
-+        .expireAfterWrite(1, java.util.concurrent.TimeUnit.MINUTES)
-+        .build(
-+            new com.google.common.cache.CacheLoader<>() {
-+                @Override
-+                public Boolean load(CraftPlayer player) {
-+                    return player.hasPermission("purpur.bypassIdleKick");
-+                }
-+            }
-+        );
-+    // Purpur end
-+
-     @Override
-     public void tick() {
-         if (this.ackBlockChangesUpTo > -1) {
-@@ -398,6 +412,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         this.recipeSpamPackets.tick(); // Paper - auto recipe limit
-         this.dropSpamThrottler.tick();
-         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits
-+            // Purpur start
-+            this.player.setAfk(true);
-+            if (!this.player.level().purpurConfig.idleTimeoutKick || (!Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK")) && kickPermissionCache.getUnchecked(this.player.getBukkitEntity()))) {
-+                return;
-+            }
-+            // Purpur end
-             this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
-             this.disconnect((Component) Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
-         }
-@@ -663,6 +683,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                     this.lastYaw = to.getYaw();
-                     this.lastPitch = to.getPitch();
- 
-+                    if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur
-+
-                     Location oldTo = to.clone();
-                     PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
-                     this.cserver.getPluginManager().callEvent(event);
-@@ -1501,7 +1523,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                                     movedWrongly = true;
-                                     if (event.getLogWarning())
-                                 // Paper end
-                                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
-+                                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), d11); // Purpur
-                                 } // Paper
-                             }
- 
-@@ -1569,6 +1591,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                                     this.lastYaw = to.getYaw();
-                                     this.lastPitch = to.getPitch();
- 
-+                                    if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur
-+
-                                     Location oldTo = to.clone();
-                                     PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
-                                     this.cserver.getPluginManager().callEvent(event);
-diff --git a/src/main/java/net/minecraft/server/players/SleepStatus.java b/src/main/java/net/minecraft/server/players/SleepStatus.java
-index 823efad652d8ff9e96b99375b102fef6f017716e..caa8a69bde0c212c36dd990a67836ac2f95548c0 100644
--- a/src/main/java/net/minecraft/server/players/SleepStatus.java
-+++ b/src/main/java/net/minecraft/server/players/SleepStatus.java
-@@ -19,7 +19,7 @@ public class SleepStatus {
- 
-     public boolean areEnoughDeepSleeping(int percentage, List<ServerPlayer> players) {
-         // CraftBukkit start
-        int j = (int) players.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping; }).count();
-+        int j = (int) players.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping || (eh.level().purpurConfig.idleTimeoutCountAsSleeping && eh.isAfk()); }).count(); // Purpur
-         boolean anyDeepSleep = players.stream().anyMatch(Player::isSleepingLongEnough);
- 
-         return anyDeepSleep && j >= this.sleepersNeeded(percentage);
-@@ -52,7 +52,7 @@ public class SleepStatus {
- 
-             if (!entityplayer.isSpectator()) {
-                 ++this.activePlayers;
-                if (entityplayer.isSleeping() || entityplayer.fauxSleeping) { // CraftBukkit
-+                if ((entityplayer.isSleeping() || entityplayer.fauxSleeping) || (entityplayer.level().purpurConfig.idleTimeoutCountAsSleeping && entityplayer.isAfk())) { // CraftBukkit // Purpur
-                     ++this.sleepingPlayers;
-                 }
-                 // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index 6bf691fcc6486bde73bae30eff09142802c29eda..59c4d3753c7084e92402608b7fb3c4adbc6c2f65 100644
--- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
-+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-@@ -39,6 +39,7 @@ public final class EntitySelector {
-         return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks;
-     };
-     // Paper end - Ability to control player's insomnia and phantoms
-+    public static Predicate<Player> notAfk = (player) -> !player.isAfk(); // Purpur
- 
-     private EntitySelector() {}
-     // Paper start - Affects Spawning API
-diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-index 52982c1e6a4da36392569c791853279f5f9ac31a..b3d4c61b1769b6fcc98b7af854f774d24bf39d98 100644
--- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-@@ -64,6 +64,10 @@ public class TargetingConditions {
-             return false;
-         } else if (this.selector != null && !this.selector.test(target, world)) {
-             return false;
-+        // Purpur start
-+        } else if (!world.purpurConfig.idleTimeoutTargetPlayer && target instanceof net.minecraft.server.level.ServerPlayer player && player.isAfk()) {
-+            return false;
-+        // Purpur end
-         } else {
-             if (tester == null) {
-                 if (this.isCombat && (!target.canBeSeenAsEnemy() || world.getDifficulty() == Difficulty.PEACEFUL)) {
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 7e9f9b1f9e932116fc12db9cc2c0135144156eda..d1b6e7cf8d110d9106ea99431cf9719ea3b102d5 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -203,6 +203,13 @@ public abstract class Player extends LivingEntity {
-     public boolean fauxSleeping;
-     public int oldLevel = -1;
- 
-+    public void setAfk(boolean afk) {
-+    }
-+
-+    public boolean isAfk() {
-+        return false;
-+    }
-+
-     @Override
-     public CraftHumanEntity getBukkitEntity() {
-         return (CraftHumanEntity) super.getBukkitEntity();
-diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 5d7a6e4b73f032db356e7ec369b150013e940ee6..6b2cda6d578a0983b2401ea20629275431018433 100644
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -184,7 +184,7 @@ public interface EntityGetter extends ca.spottedleaf.moonrise.patches.chunk_syst
- 
-     default boolean hasNearbyAlivePlayer(double x, double y, double z, double range) {
-         for (Player player : this.players()) {
-            if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
-+            if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player) && EntitySelector.notAfk.test(player)) { // Purpur
-                 double d = player.distanceToSqr(x, y, z);
-                 if (range < 0.0 || d < range * range) {
-                     return true;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d2322233aff511bcc5c85b24230c2e08dc0bcd0..358f42585c865efbd814787879f919f70234e5c4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -583,10 +583,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public void setPlayerListName(String name) {
-+        // Purpur start
-+        setPlayerListName(name, false);
-+    }
-+    public void setPlayerListName(String name, boolean useMM) {
-+        // Purpur end
-         if (name == null) {
-             name = this.getName();
-         }
-        this.getHandle().listName = name.equals(this.getName()) ? null : CraftChatMessage.fromStringOrNull(name);
-+        this.getHandle().listName = name.equals(this.getName()) ? null : useMM ? io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name)) : CraftChatMessage.fromStringOrNull(name); // Purpur
-         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)) {
-@@ -3586,5 +3591,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public boolean usesPurpurClient() {
-         return getHandle().purpurClient;
-     }
-+
-+    @Override
-+    public boolean isAfk() {
-+        return getHandle().isAfk();
-+    }
-+
-+    @Override
-+    public void setAfk(boolean setAfk) {
-+        getHandle().setAfk(setAfk);
-+    }
-+
-+    @Override
-+    public void resetIdleTimer() {
-+        getHandle().resetLastActionTime();
-+    }
-     // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a83117ed0a0c98d7ae18e925338b58930946c96a..a6728ce7ac27512676cfa06fdfbfb8652f8ff6a5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -177,8 +177,18 @@ public class PurpurConfig {
-     }
- 
-     public static String cannotRideMob = "<red>You cannot mount that mob";
-+    public static String afkBroadcastAway = "<yellow><italic>%s is now AFK";
-+    public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
-+    public static boolean afkBroadcastUseDisplayName = false;
-+    public static String afkTabListPrefix = "[AFK] ";
-+    public static String afkTabListSuffix = "";
-     private static void messages() {
-         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-+        afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-+        afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
-+        afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
-+        afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
-+        afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
-     }
- 
-     public static int barrelRows = 3;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ee9bcb7d011f20575cbbbe2e0ded1e53087aba7a..9b1a4502aa6c26c7524ec17697250317b7f381fd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -91,6 +91,24 @@ public class PurpurWorldConfig {
-         return value.isEmpty() ? fallback : value;
-     }
- 
-+    public boolean idleTimeoutKick = true;
-+    public boolean idleTimeoutTickNearbyEntities = true;
-+    public boolean idleTimeoutCountAsSleeping = false;
-+    public boolean idleTimeoutUpdateTabList = false;
-+    public boolean idleTimeoutTargetPlayer = true;
-+    private void playerSettings() {
-+        if (PurpurConfig.version < 19) {
-+            boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-+            set("gameplay-mechanics.player.idle-timeout.mods-target", null);
-+            set("gameplay-mechanics.player.idle-timeout.mobs-target", oldVal);
-+        }
-+        idleTimeoutKick = System.getenv("PURPUR_FORCE_IDLE_KICK") == null ? getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick) : Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK"));
-+        idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-+        idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
-+        idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
-+        idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
-+    }
-+
-     public boolean babiesAreRidable = true;
-     public boolean untamedTamablesAreRidable = true;
-     public boolean useNightVisionWhenRiding = false;
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index bc525c7843b9cc0f7705c0dc6795c05f4e5b4bb1..a017374f2027946ef465cf41fd6ed6de7f00e19f 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -203,6 +203,8 @@ public class ActivationRange
-                 continue;
-             }
- 
-+            if (!player.level().purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur
-+
-             // Paper start
-             int worldHeight = world.getHeight();
-             ActivationRange.maxBB = player.getBoundingBox().inflate( maxRange, worldHeight, maxRange );
--- a/patches/unapplied-server/0014-Bring-back-server-name.patch
+++ b/patches/unapplied-server/0014-Bring-back-server-name.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 26 May 2019 15:19:14 -0500
-Subject: [PATCH] Bring back server name
-
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index c3ec370b83b895be0f03662e3884fa4a2442a2a6..05e16103af3fd276f0196ddf1a2e5b729b025c34 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -56,6 +56,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-     public final boolean onlineMode = this.get("online-mode", true);
-     public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
-     public final String serverIp = this.get("server-ip", "");
-+    public final String serverName = this.get("server-name", "Unknown Server"); // Purpur
-     public final boolean pvp = this.get("pvp", true);
-     public final boolean allowFlight = this.get("allow-flight", false);
-     public final String motd = this.get("motd", "A Minecraft Server");
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 48a8bdd45c063797144e98e76f6007ae9025124e..96f0ff6877e2959fe1ab26728ee64b9c9b777d26 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3285,4 +3285,11 @@ public final class CraftServer implements Server {
-         this.console.addPluginAllowingSleep(plugin.getName(), value);
-     }
-     // Paper end - API to check if the server is sleeping
-+
-+    // Purpur start
-+    @Override
-+    public String getServerName() {
-+        return this.getProperties().serverName;
-+    }
-+    // Purpur end
- }
--- a/patches/unapplied-server/0015-Configurable-server-mod-name.patch
+++ b/patches/unapplied-server/0015-Configurable-server-mod-name.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 21 Mar 2020 11:47:39 -0500
-Subject: [PATCH] Configurable server mod name
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ff4d04092aa6322788d55d3c0253cb7f6f3cd493..85e04c38cfda8c546f241a71deeb31efde22dc91 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2019,7 +2019,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
-        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
-+        return org.purpurmc.purpur.PurpurConfig.serverModName; // Paper // Purpur
-     }
- 
-     public SystemReport fillSystemReport(SystemReport details) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a6728ce7ac27512676cfa06fdfbfb8652f8ff6a5..df2be3351bcaaf1ffb73261da6c840314f5c11a1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -191,6 +191,11 @@ public class PurpurConfig {
-         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
-     }
- 
-+    public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();
-+    private static void serverModName() {
-+        serverModName = getString("settings.server-mod-name", serverModName);
-+    }
-+
-     public static int barrelRows = 3;
-     public static boolean enderChestSixRows = false;
-     public static boolean enderChestPermissionRows = false;
--- a/patches/unapplied-server/0016-Lagging-threshold.patch
+++ b/patches/unapplied-server/0016-Lagging-threshold.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Tue, 23 Jul 2019 10:07:16 -0500
-Subject: [PATCH] Lagging threshold
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 85e04c38cfda8c546f241a71deeb31efde22dc91..85f5f8a30053cae087b223f0d80432c5318e67d6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -328,6 +328,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     // Spigot end
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
-     public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
-+    public boolean lagging = false; // Purpur
- 
-     public volatile Thread shutdownThread; // Paper
-     public volatile boolean abnormalExit = false; // Paper
-@@ -1304,6 +1305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     this.recentTps[0] = tps1.getAverage();
-                     this.recentTps[1] = tps5.getAverage();
-                     this.recentTps[2] = tps15.getAverage();
-+                    lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
-                     tickSection = currentTime;
-                 }
-                 // Paper end - further improve server tick loop
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 96f0ff6877e2959fe1ab26728ee64b9c9b777d26..5fa7d429b19d135c5b3f719c35042818499b4563 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3291,5 +3291,10 @@ public final class CraftServer implements Server {
-     public String getServerName() {
-         return this.getProperties().serverName;
-     }
-+
-+    @Override
-+    public boolean isLagging() {
-+        return getServer().lagging;
-+    }
-     // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index df2be3351bcaaf1ffb73261da6c840314f5c11a1..a6c90de7726a264ca44c3e795e9b6a4e1c313bc3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -196,6 +196,11 @@ public class PurpurConfig {
-         serverModName = getString("settings.server-mod-name", serverModName);
-     }
- 
-+    public static double laggingThreshold = 19.0D;
-+    private static void tickLoopSettings() {
-+        laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
-+    }
-+
-     public static int barrelRows = 3;
-     public static boolean enderChestSixRows = false;
-     public static boolean enderChestPermissionRows = false;
--- a/patches/unapplied-server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/unapplied-server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 5 Jul 2019 18:21:00 -0500
-Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 7e7603680310976312050aaff5bdaa805901617f..23b921a79bd563fd0a1bf7afd55a8e52ff1da521 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -405,6 +405,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-         return EntityType.register(EntityType.vanillaEntityId(id), type);
-     }
- 
-+    // Purpur start
-+    public static EntityType<?> getFromBukkitType(org.bukkit.entity.EntityType bukkitType) {
-+        return getFromKey(ResourceLocation.parse(bukkitType.getKey().toString()));
-+    }
-+
-+    public static EntityType<?> getFromKey(ResourceLocation location) {
-+        return BuiltInRegistries.ENTITY_TYPE.getValue(location);
-+    }
-+    // Purpur end
-+
-     public static ResourceLocation getKey(EntityType<?> type) {
-         return BuiltInRegistries.ENTITY_TYPE.getKey(type);
-     }
-@@ -605,6 +615,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-         return this.category;
-     }
- 
-+    // Purpur start
-+    public String getName() {
-+        return BuiltInRegistries.ENTITY_TYPE.getKey(this).getPath();
-+    }
-+
-+    public String getTranslatedName() {
-+        return getDescription().getString();
-+    }
-+    // Purpur end
-+
-     public String getDescriptionId() {
-         return this.descriptionId;
-     }
-diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index 9956ed42df55daa6d97fd6e3ab5368dad91cfaf0..e0e746d6c78421b40777125ba49f0a04809f5415 100644
--- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-+++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-@@ -73,6 +73,24 @@ public class SpawnEggItem extends Item {
-                 Spawner spawner = (Spawner) tileentity;
- 
-                 entitytypes = this.getType(itemstack);
-+
-+                // Purpur start
-+                if (spawner instanceof net.minecraft.world.level.block.entity.SpawnerBlockEntity) {
-+                    org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+                    org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent event = new org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.CreatureSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(entitytypes.getName()));
-+                    if (!event.callEvent()) {
-+                        return InteractionResult.FAIL;
-+                    }
-+                    entitytypes = EntityType.getFromBukkitType(event.getEntityType());
-+                } else if (spawner instanceof net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity) {
-+                    org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+                    org.purpurmc.purpur.event.PlayerSetTrialSpawnerTypeWithEggEvent event = new org.purpurmc.purpur.event.PlayerSetTrialSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.TrialSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(entitytypes.getName()));
-+                    if (!event.callEvent()) {
-+                        return InteractionResult.FAIL;
-+                    }
-+                    entitytypes = EntityType.getFromBukkitType(event.getEntityType());
-+                }
-+                // Purpur end
-                 spawner.setEntityId(entitytypes, world.getRandom());
-                 world.sendBlockUpdated(blockposition, iblockdata, iblockdata, 3);
-                 world.gameEvent((Entity) context.getPlayer(), (Holder) GameEvent.BLOCK_CHANGE, blockposition);
--- a/patches/unapplied-server/0018-Anvil-API.patch
+++ b/patches/unapplied-server/0018-Anvil-API.patch
@@ -1,225 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 19 Apr 2020 00:17:56 -0500
-Subject: [PATCH] Anvil API
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 4680f77a275d8d2b226018db89a571ac25998dd8..bfc90524bd739ed1d91fe9912e38093b3c28928f 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -80,6 +80,7 @@ public abstract class AbstractContainerMenu {
-     @Nullable
-     private ContainerSynchronizer synchronizer;
-     private boolean suppressRemoteUpdates;
-+    @Nullable protected ItemStack activeQuickItem = null; // Purpur - Anvil API
- 
-     // CraftBukkit start
-     public boolean checkReachable = true;
-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index 286ae002e1711ad9e800b7f2091988d66cd572a7..f8c0a4fd95f341cbf8f6a06dfae408d505b0f018 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-@@ -25,6 +25,12 @@ import org.slf4j.Logger;
- import org.bukkit.craftbukkit.inventory.view.CraftAnvilView;
- // CraftBukkit end
- 
-+// Purpur start - Anvil API
-+import net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket;
-+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
-+import net.minecraft.server.level.ServerPlayer;
-+// Purpur end - Anvil API
-+
- public class AnvilMenu extends ItemCombinerMenu {
- 
-     public static final int INPUT_SLOT = 0;
-@@ -55,6 +61,10 @@ public class AnvilMenu extends ItemCombinerMenu {
-     private CraftAnvilView bukkitEntity;
-     // CraftBukkit end
-     public boolean bypassEnchantmentLevelRestriction = false; // Paper - bypass anvil level restrictions
-+    // Purpur start - Anvil API
-+    public boolean bypassCost = false;
-+    public boolean canDoUnsafeEnchants = false;
-+    // Purpur end - Anvil API
- 
-     public AnvilMenu(int syncId, Inventory inventory) {
-         this(syncId, inventory, ContainerLevelAccess.NULL);
-@@ -82,12 +92,17 @@ public class AnvilMenu extends ItemCombinerMenu {
- 
-     @Override
-     protected boolean mayPickup(Player player, boolean present) {
-        return (player.hasInfiniteMaterials() || player.experienceLevel >= this.cost.get()) && this.cost.get() > AnvilMenu.DEFAULT_DENIED_COST && present; // CraftBukkit - allow cost 0 like a free item
-+        return (player.hasInfiniteMaterials() || player.experienceLevel >= this.cost.get()) && (this.bypassCost || this.cost.get() > AnvilMenu.DEFAULT_DENIED_COST) && present; // CraftBukkit - allow cost 0 like a free item // Purpur - Anvil API
-     }
- 
-     @Override
-     protected void onTake(Player player, ItemStack stack) {
-+        // Purpur start - Anvil API
-+        ItemStack itemstack = this.activeQuickItem != null ? this.activeQuickItem : stack;
-+        if (org.purpurmc.purpur.event.inventory.AnvilTakeResultEvent.getHandlerList().getRegisteredListeners().length > 0) new org.purpurmc.purpur.event.inventory.AnvilTakeResultEvent(player.getBukkitEntity(), getBukkitView(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)).callEvent();
-+        // Purpur end - Anvil API
-         if (!player.getAbilities().instabuild) {
-+            if (this.bypassCost) ((ServerPlayer) player).lastSentExp = -1; else // Purpur - Anvil API
-             player.giveExperienceLevels(-this.cost.get());
-         }
- 
-@@ -138,6 +153,12 @@ public class AnvilMenu extends ItemCombinerMenu {
- 
-     @Override
-     public void createResult() {
-+        // Purpur start - Anvil API
-+        this.bypassCost = false;
-+        this.canDoUnsafeEnchants = false;
-+        if (org.purpurmc.purpur.event.inventory.AnvilUpdateResultEvent.getHandlerList().getRegisteredListeners().length > 0) new org.purpurmc.purpur.event.inventory.AnvilUpdateResultEvent(getBukkitView()).callEvent();
-+        // Purpur end - Anvil API
-+
-         ItemStack itemstack = this.inputSlots.getItem(0);
- 
-         this.onlyRenaming = false;
-@@ -146,7 +167,7 @@ public class AnvilMenu extends ItemCombinerMenu {
-         long j = 0L;
-         byte b0 = 0;
- 
-        if (!itemstack.isEmpty() && EnchantmentHelper.canStoreEnchantments(itemstack)) {
-+        if (!itemstack.isEmpty() && this.canDoUnsafeEnchants || EnchantmentHelper.canStoreEnchantments(itemstack)) { // Purpur - Anvil API
-             ItemStack itemstack1 = itemstack.copy();
-             ItemStack itemstack2 = this.inputSlots.getItem(1);
-             ItemEnchantments.Mutable itemenchantments_a = new ItemEnchantments.Mutable(EnchantmentHelper.getEnchantmentsForCrafting(itemstack1));
-@@ -225,7 +246,7 @@ public class AnvilMenu extends ItemCombinerMenu {
-                             Holder<Enchantment> holder1 = (Holder) iterator1.next();
- 
-                             if (!holder1.equals(holder) && !Enchantment.areCompatible(holder, holder1)) {
-                                flag3 = false;
-+                                flag3 = this.canDoUnsafeEnchants; // Purpur - Anvil API
-                                 ++i;
-                             }
-                         }
-@@ -287,6 +308,12 @@ public class AnvilMenu extends ItemCombinerMenu {
-                 this.onlyRenaming = true;
-             }
- 
-+            // Purpur start - Anvil API
-+            if (this.bypassCost && this.cost.get() >= this.maximumRepairCost) {
-+                this.cost.set(this.maximumRepairCost - 1);
-+            }
-+            // Purpur end - Anvil API
-+
-             if (this.cost.get() >= this.maximumRepairCost && !this.player.getAbilities().instabuild) { // CraftBukkit
-                 itemstack1 = ItemStack.EMPTY;
-             }
-@@ -307,6 +334,13 @@ public class AnvilMenu extends ItemCombinerMenu {
- 
-             org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), itemstack1); // CraftBukkit
-             this.broadcastChanges();
-+
-+            // Purpur start - Anvil API
-+            if (this.canDoUnsafeEnchants && itemstack1 != ItemStack.EMPTY) {
-+                ((ServerPlayer) this.player).connection.send(new ClientboundContainerSetSlotPacket(this.containerId, this.incrementStateId(), 2, itemstack1));
-+                ((ServerPlayer) this.player).connection.send(new ClientboundContainerSetDataPacket(this.containerId, 0, this.cost.get()));
-+            }
-+            // Purpur end - Anvil API
-         } else {
-             org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), ItemStack.EMPTY); // CraftBukkit
-             this.cost.set(AnvilMenu.DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
-diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
-index a5d53a656513ae81cc3f9fc506caf6adaba62a8e..ac9df238ef0f3d009f25976b95e0b750e963e952 100644
--- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
-@@ -164,7 +164,9 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
-                 return ItemStack.EMPTY;
-             }
- 
-+            this.activeQuickItem = itemstack; // Purpur - Anvil API
-             slot1.onTake(player, itemstack1);
-+            this.activeQuickItem = null; // Purpur - Anvil API
-         }
- 
-         return itemstack;
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb51b87f39e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-@@ -19,6 +19,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
-     private int repairCost;
-     private int repairCostAmount;
-     private int maximumRepairCost;
-+    // Purpur start - Anvil API
-+    private boolean bypassCost;
-+    private boolean canDoUnsafeEnchants;
-+    // Purpur end - Anvil API
- 
-     public CraftInventoryAnvil(Location location, Container inventory, Container resultInventory) {
-         super(inventory, resultInventory);
-@@ -27,6 +31,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
-         this.repairCost = CraftInventoryAnvil.DEFAULT_REPAIR_COST;
-         this.repairCostAmount = CraftInventoryAnvil.DEFAULT_REPAIR_COST_AMOUNT;
-         this.maximumRepairCost = CraftInventoryAnvil.DEFAULT_MAXIMUM_REPAIR_COST;
-+        // Purpur start - Anvil API
-+        this.bypassCost = false;
-+        this.canDoUnsafeEnchants = false;
-+        // Purpur end - Anvil API
-     }
- 
-     @Override
-@@ -113,4 +121,30 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
-             consumer.accept(cav);
-         }
-     }
-+
-+    // Purpur start - Anvil API
-+    @Override
-+    public boolean canBypassCost() {
-+        this.syncWithArbitraryViewValue((cav) -> this.bypassCost = cav.canBypassCost());
-+        return this.bypassCost;
-+    }
-+
-+    @Override
-+    public void setBypassCost(boolean bypassCost) {
-+        this.bypassCost = bypassCost;
-+        this.syncViews((cav) -> cav.setBypassCost(bypassCost));
-+    }
-+
-+    @Override
-+    public boolean canDoUnsafeEnchants() {
-+        this.syncWithArbitraryViewValue((cav) -> this.canDoUnsafeEnchants = cav.canDoUnsafeEnchants());
-+        return this.canDoUnsafeEnchants;
-+    }
-+
-+    @Override
-+    public void setDoUnsafeEnchants(boolean canDoUnsafeEnchants) {
-+        this.canDoUnsafeEnchants = canDoUnsafeEnchants;
-+        this.syncViews((cav) -> cav.setDoUnsafeEnchants(canDoUnsafeEnchants));
-+    }
-+    // Purpur end - Anvil API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
-index f86c95a13dff012de5db3e41ac261e9e8d44d9f3..1db0b790d824e419bb5fb6ab1f3003e120f9763b 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
-@@ -75,4 +75,26 @@ public class CraftAnvilView extends CraftInventoryView<AnvilMenu, AnvilInventory
-             this.setMaximumRepairCost(legacy.getMaximumRepairCost());
-         }
-     }
-+
-+    // Purpur start - Anvil API
-+    @Override
-+    public boolean canBypassCost() {
-+        return this.container.bypassCost;
-+    }
-+
-+    @Override
-+    public void setBypassCost(boolean bypassCost) {
-+        this.container.bypassCost = bypassCost;
-+    }
-+
-+    @Override
-+    public boolean canDoUnsafeEnchants() {
-+        return this.container.canDoUnsafeEnchants;
-+    }
-+
-+    @Override
-+    public void setDoUnsafeEnchants(boolean canDoUnsafeEnchants) {
-+        this.container.canDoUnsafeEnchants = canDoUnsafeEnchants;
-+    }
-+    // Purpur end - Anvil API
- }
--- a/patches/unapplied-server/0019-Alternative-Keepalive-Handling.patch
+++ b/patches/unapplied-server/0019-Alternative-Keepalive-Handling.patch
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 11 Oct 2019 00:17:39 -0500
-Subject: [PATCH] Alternative Keepalive Handling
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index b6dd6bde947ac7502f25d3160399596130e8064f..7d276c191b391bca24948ddb36b8b7d0f1f03b03 100644
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -80,6 +80,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     private long keepAliveChallenge;
-     private long closedListenerTime;
-     private boolean closed = false;
-+    private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Purpur
-     private int latency;
-     private volatile boolean suspendFlushingOnServerThread = false;
-     public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
-@@ -137,6 +138,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
- 
-     @Override
-     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
-+        // Purpur start
-+        if (org.purpurmc.purpur.PurpurConfig.useAlternateKeepAlive) {
-+            if (this.keepAlivePending && !keepAlives.isEmpty() && keepAlives.contains(packet.getId())) {
-+                int ping = (int) (Util.getMillis() - packet.getId());
-+                this.latency = (this.latency * 3 + ping) / 4;
-+                this.keepAlivePending = false;
-+                keepAlives.clear(); // we got a valid response, lets roll with it and forget the rest
-+            }
-+        } else
-+        // Purpur end
-         //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - handle ServerboundKeepAlivePacket async
-         if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
-             int i = (int) (Util.getMillis() - this.keepAliveTime);
-@@ -269,6 +280,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-         long currentTime = Util.getMillis();
-         long elapsedTime = currentTime - this.keepAliveTime;
- 
-+        // Purpur start
-+        if (org.purpurmc.purpur.PurpurConfig.useAlternateKeepAlive) {
-+            if (elapsedTime >= 1000L) { // 1 second
-+                if (this.keepAlivePending && !this.processedDisconnect && keepAlives.size() * 1000L >= KEEPALIVE_LIMIT) {
-+                    this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT);
-+                } else if (this.checkIfClosed(currentTime)) {
-+                    this.keepAlivePending = true;
-+                    this.keepAliveTime = currentTime; // hijack this field for 1 second intervals
-+                    this.keepAlives.add(currentTime); // currentTime is ID
-+                    this.send(new ClientboundKeepAlivePacket(currentTime));
-+                }
-+            }
-+        } else
-+        // Purpur end
-+
-         if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // Paper - use vanilla's 15000L between keep alive packets
-             if (this.keepAlivePending && !this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected
-                 this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a6c90de7726a264ca44c3e795e9b6a4e1c313bc3..3b4a8c9d5a60de94ad79a781414de8de44973e6f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -201,6 +201,11 @@ public class PurpurConfig {
-         laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
-     }
- 
-+    public static boolean useAlternateKeepAlive = false;
-+    private static void useAlternateKeepAlive() {
-+        useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
-+    }
-+
-     public static int barrelRows = 3;
-     public static boolean enderChestSixRows = false;
-     public static boolean enderChestPermissionRows = false;
--- a/patches/unapplied-server/0020-Enchantment-convenience-methods.patch
+++ b/patches/unapplied-server/0020-Enchantment-convenience-methods.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Krakenied <Krakenied1@gmail.com>
-Date: Sat, 15 Jun 2024 14:31:48 +0200
-Subject: [PATCH] Enchantment convenience methods
-
-
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-index f99b87cf70df7eaac13d46f4e0234b1e6483d342..d8fc10f9cd0ab2c26e64613006569a86ce201550 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-@@ -578,4 +578,14 @@ public class EnchantmentHelper {
-     interface EnchantmentVisitor {
-         void accept(Holder<Enchantment> enchantment, int level);
-     }
-+
-+    // Purpur start - Enchantment convenience methods
-+    public static Holder.Reference<Enchantment> getEnchantmentHolder(ResourceKey<Enchantment> enchantment) {
-+        return net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(enchantment);
-+    }
-+
-+    public static int getItemEnchantmentLevel(ResourceKey<Enchantment> enchantment, ItemStack stack) {
-+        return getItemEnchantmentLevel(getEnchantmentHolder(enchantment), stack);
-+    }
-+    // Purpur end - Enchantment convenience methods
- }
--- a/patches/unapplied-server/0021-Silk-touch-spawners.patch
+++ b/patches/unapplied-server/0021-Silk-touch-spawners.patch
@@ -1,190 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 9 May 2019 14:27:37 -0500
-Subject: [PATCH] Silk touch spawners
-
-
-diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index c816c935ecc74a811ffdffbe6ded73c06e92324a..b5b7f1db21a22f16f06ced775c8173f90e36a91c 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -213,6 +213,7 @@ public class BlockItem extends Item {
- 
-                 if (tileentity != null) {
-                     if (!world.isClientSide && tileentity.onlyOpCanSetNbt() && (player == null || !(player.canUseGameMasterBlocks() || (player.getAbilities().instabuild && player.getBukkitEntity().hasPermission("minecraft.nbt.place"))))) { // Spigot - add permission
-+                        if (!(!world.isClientSide && world.purpurConfig.silkTouchEnabled && tileentity instanceof net.minecraft.world.level.block.entity.SpawnerBlockEntity && player.getBukkitEntity().hasPermission("purpur.drop.spawners")))
-                         return false;
-                     }
- 
-diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
-index 5a70111cd39af50981cfd440c021340da1de5eab..bf7d12594375d5b252db540a6d669a6e6aca7de8 100644
--- a/src/main/java/net/minecraft/world/item/Items.java
-+++ b/src/main/java/net/minecraft/world/item/Items.java
-@@ -363,7 +363,7 @@ public class Items {
-     public static final Item PURPUR_BLOCK = registerBlock(Blocks.PURPUR_BLOCK);
-     public static final Item PURPUR_PILLAR = registerBlock(Blocks.PURPUR_PILLAR);
-     public static final Item PURPUR_STAIRS = registerBlock(Blocks.PURPUR_STAIRS);
-    public static final Item SPAWNER = registerBlock(Blocks.SPAWNER);
-+    public static final Item SPAWNER = registerBlock(Blocks.SPAWNER, org.purpurmc.purpur.item.SpawnerItem::new, new Item.Properties().rarity(Rarity.EPIC)); // Purpur
-     public static final Item CREAKING_HEART = registerBlock(Blocks.CREAKING_HEART);
-     public static final Item CHEST = registerBlock(Blocks.CHEST, settings -> settings.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY));
-     public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE);
-diff --git a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
-index 4f190a40b8474aa06a92c8afcc06d0044120ff7b..80ee7a6f010cc838625674007a3ea908f2f9dadd 100644
--- a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
-@@ -42,6 +42,57 @@ public class SpawnerBlock extends BaseEntityBlock {
-         return createTickerHelper(type, BlockEntityType.MOB_SPAWNER, world.isClientSide ? SpawnerBlockEntity::clientTick : SpawnerBlockEntity::serverTick);
-     }
- 
-+    // Purpur start
-+    @Override
-+    public void playerDestroy(Level level, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack, boolean includeDrops, boolean dropExp) {
-+        if (level.purpurConfig.silkTouchEnabled && player.getBukkitEntity().hasPermission("purpur.drop.spawners") && isSilkTouch(level, stack)) {
-+            ItemStack item = new ItemStack(Blocks.SPAWNER.asItem());
-+
-+            net.minecraft.world.level.SpawnData nextSpawnData = blockEntity instanceof SpawnerBlockEntity spawnerBlock ? spawnerBlock.getSpawner().nextSpawnData : null;
-+            java.util.Optional<net.minecraft.world.entity.EntityType<?>> type = java.util.Optional.empty();
-+            if (nextSpawnData != null) {
-+                type = net.minecraft.world.entity.EntityType.by(nextSpawnData.getEntityToSpawn());
-+                net.minecraft.world.level.SpawnData.CODEC.encodeStart(net.minecraft.nbt.NbtOps.INSTANCE, nextSpawnData).result().ifPresent(tag -> item.set(net.minecraft.core.component.DataComponents.CUSTOM_DATA, net.minecraft.world.item.component.CustomData.EMPTY.update(compoundTag -> compoundTag.put("Purpur.SpawnData", tag))));
-+            }
-+
-+            if (type.isPresent()) {
-+                final net.kyori.adventure.text.Component mobName = io.papermc.paper.adventure.PaperAdventure.asAdventure(type.get().getDescription());
-+
-+                String name = level.purpurConfig.silkTouchSpawnerName;
-+                if (name != null && !name.isEmpty() && !name.equals("Monster Spawner")) {
-+                    net.kyori.adventure.text.Component displayName = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name, net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("mob", mobName));
-+                    if (name.startsWith("<reset>")) {
-+                        displayName = displayName.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
-+                    }
-+                    item.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, io.papermc.paper.adventure.PaperAdventure.asVanilla(displayName));
-+                }
-+
-+                List<String> lore = level.purpurConfig.silkTouchSpawnerLore;
-+                if (lore != null && !lore.isEmpty()) {
-+
-+                    List<Component> loreComponentList = new java.util.ArrayList<>();
-+                    for (String line : lore) {
-+                        net.kyori.adventure.text.Component lineComponent = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(line, net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("mob", mobName));
-+                        if (line.startsWith("<reset>")) {
-+                            lineComponent = lineComponent.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
-+                        }
-+                        loreComponentList.add(io.papermc.paper.adventure.PaperAdventure.asVanilla(lineComponent));
-+                    }
-+
-+                    item.set(net.minecraft.core.component.DataComponents.LORE, new net.minecraft.world.item.component.ItemLore(loreComponentList, loreComponentList));
-+                }
-+                item.set(net.minecraft.core.component.DataComponents.HIDE_ADDITIONAL_TOOLTIP, net.minecraft.util.Unit.INSTANCE);
-+            }
-+            popResource(level, pos, item);
-+        }
-+        super.playerDestroy(level, player, pos, state, blockEntity, stack, includeDrops, dropExp);
-+    }
-+
-+    private boolean isSilkTouch(Level level, ItemStack stack) {
-+        return stack != null && level.purpurConfig.silkTouchTools.contains(stack.getItem()) && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.SILK_TOUCH, stack) >= level.purpurConfig.minimumSilkTouchSpawnerRequire;
-+    }
-+    // Purpur end
-+
-     @Override
-     protected void spawnAfterBreak(BlockState state, ServerLevel world, BlockPos pos, ItemStack tool, boolean dropExperience) {
-         super.spawnAfterBreak(state, world, pos, tool, dropExperience);
-@@ -50,6 +101,7 @@ public class SpawnerBlock extends BaseEntityBlock {
- 
-     @Override
-     public int getExpDrop(BlockState iblockdata, ServerLevel worldserver, BlockPos blockposition, ItemStack itemstack, boolean flag) {
-+        if (worldserver.purpurConfig.silkTouchEnabled && isSilkTouch(worldserver, itemstack)) return 0; // Purpur
-         if (flag) {
-             int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9b1a4502aa6c26c7524ec17697250317b7f381fd..d6b1b49102ae4421e273f6c781e25a3b18fe13f7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -109,6 +109,38 @@ public class PurpurWorldConfig {
-         idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
-     }
- 
-+    public boolean silkTouchEnabled = false;
-+    public String silkTouchSpawnerName = "<reset><white>Monster Spawner";
-+    public List<String> silkTouchSpawnerLore = new ArrayList<>();
-+    public List<Item> silkTouchTools = new ArrayList<>();
-+    public int minimumSilkTouchSpawnerRequire = 1;
-+    private void silkTouchSettings() {
-+        if (PurpurConfig.version < 21) {
-+            String oldName = getString("gameplay-mechanics.silk-touch.spawner-name", silkTouchSpawnerName);
-+            set("gameplay-mechanics.silk-touch.spawner-name", "<reset>" + ChatColor.toMM(oldName.replace("{mob}", "<mob>")));
-+            List<String> list = new ArrayList<>();
-+            getList("gameplay-mechanics.silk-touch.spawner-lore", List.of("Spawns a <mob>"))
-+                    .forEach(line -> list.add("<reset>" + ChatColor.toMM(line.toString().replace("{mob}", "<mob>"))));
-+            set("gameplay-mechanics.silk-touch.spawner-lore", list);
-+        }
-+        silkTouchEnabled = getBoolean("gameplay-mechanics.silk-touch.enabled", silkTouchEnabled);
-+        silkTouchSpawnerName = getString("gameplay-mechanics.silk-touch.spawner-name", silkTouchSpawnerName);
-+        minimumSilkTouchSpawnerRequire = getInt("gameplay-mechanics.silk-touch.minimal-level", minimumSilkTouchSpawnerRequire);
-+        silkTouchSpawnerLore.clear();
-+        getList("gameplay-mechanics.silk-touch.spawner-lore", List.of("Spawns a <mob>"))
-+                .forEach(line -> silkTouchSpawnerLore.add(line.toString()));
-+        silkTouchTools.clear();
-+        getList("gameplay-mechanics.silk-touch.tools", List.of(
-+                "minecraft:iron_pickaxe",
-+                "minecraft:golden_pickaxe",
-+                "minecraft:diamond_pickaxe",
-+                "minecraft:netherite_pickaxe"
-+        )).forEach(key -> {
-+            Item item = BuiltInRegistries.ITEM.getValue(ResourceLocation.parse(key.toString()));
-+            if (item != Items.AIR) silkTouchTools.add(item);
-+        });
-+    }
-+
-     public boolean babiesAreRidable = true;
-     public boolean untamedTamablesAreRidable = true;
-     public boolean useNightVisionWhenRiding = false;
-diff --git a/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java b/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ed50cb2115401c9039df4136caf5a087a5f5991c
--- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java
-@@ -0,0 +1,40 @@
-+package org.purpurmc.purpur.item;
-+
-+import net.minecraft.core.BlockPos;
-+import net.minecraft.core.component.DataComponents;
-+import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.world.entity.EntityType;
-+import net.minecraft.world.entity.player.Player;
-+import net.minecraft.world.item.BlockItem;
-+import net.minecraft.world.item.ItemStack;
-+import net.minecraft.world.item.component.CustomData;
-+import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.block.Block;
-+import net.minecraft.world.level.block.entity.BlockEntity;
-+import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
-+import net.minecraft.world.level.block.state.BlockState;
-+
-+public class SpawnerItem extends BlockItem {
-+
-+    public SpawnerItem(Block block, Properties settings) {
-+        super(block, settings);
-+    }
-+
-+    @Override
-+    protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, Player player, ItemStack stack, BlockState state) {
-+        boolean handled = super.updateCustomBlockEntityTag(pos, level, player, stack, state);
-+        if (level.purpurConfig.silkTouchEnabled && player.getBukkitEntity().hasPermission("purpur.place.spawners")) {
-+            BlockEntity blockEntity = level.getBlockEntity(pos);
-+            if (blockEntity instanceof SpawnerBlockEntity spawner) {
-+                CompoundTag customData = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag();
-+                if (customData.contains("Purpur.mob_type")) {
-+                    EntityType.byString(customData.getString("Purpur.mob_type")).ifPresent(type -> spawner.getSpawner().setEntityId(type, level, level.random, pos));
-+                } else if (customData.contains("Purpur.SpawnData")) {
-+                    net.minecraft.world.level.SpawnData.CODEC.parse(net.minecraft.nbt.NbtOps.INSTANCE, customData.getCompound("Purpur.SpawnData")).result()
-+                        .ifPresent(spawnData -> spawner.getSpawner().nextSpawnData = spawnData);
-+                }
-+            }
-+        }
-+        return handled;
-+    }
-+}
--- a/patches/unapplied-server/0022-Add-turtle-egg-block-options.patch
+++ b/patches/unapplied-server/0022-Add-turtle-egg-block-options.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 6 Jun 2019 22:15:46 -0500
-Subject: [PATCH] Add turtle egg block options
-
-
-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 953ddb2ea6fd48e57712e30a6addf23e188e5312..bae4931fff0db56aa125248e17b29f7c2557221f 100644
--- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-@@ -204,6 +204,25 @@ public class TurtleEggBlock extends Block {
-     }
- 
-     private boolean canDestroyEgg(ServerLevel world, Entity entity) {
-        return !(entity instanceof Turtle) && !(entity instanceof Bat) ? (!(entity instanceof LivingEntity) ? false : entity instanceof Player || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) : false;
-+        // Purpur start
-+        if (entity instanceof Turtle || entity instanceof Bat) {
-+            return false;
-+        }
-+        if (world.purpurConfig.turtleEggsBreakFromExpOrbs && entity instanceof net.minecraft.world.entity.ExperienceOrb) {
-+            return true;
-+        }
-+        if (world.purpurConfig.turtleEggsBreakFromItems && entity instanceof net.minecraft.world.entity.item.ItemEntity) {
-+            return true;
-+        }
-+        if (world.purpurConfig.turtleEggsBreakFromMinecarts && entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) {
-+            return true;
-+        }
-+        if (!(entity instanceof LivingEntity)) {
-+            return false;
-+        }
-+        if (entity instanceof Player) return true;
-+
-+        return world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
-+        // Purpur end
-     }
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d6b1b49102ae4421e273f6c781e25a3b18fe13f7..f6186c65468953756da9c381c6ee712115a244f7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -141,6 +141,15 @@ public class PurpurWorldConfig {
-         });
-     }
- 
-+    public boolean turtleEggsBreakFromExpOrbs = false;
-+    public boolean turtleEggsBreakFromItems = false;
-+    public boolean turtleEggsBreakFromMinecarts = false;
-+    private void turtleEggSettings() {
-+        turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
-+        turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
-+        turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
-+    }
-+
-     public boolean babiesAreRidable = true;
-     public boolean untamedTamablesAreRidable = true;
-     public boolean useNightVisionWhenRiding = false;
--- a/patches/unapplied-server/0023-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/unapplied-server/0023-Logger-settings-suppressing-pointless-logs.patch
@@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 00:52:12 -0500
-Subject: [PATCH] Logger settings (suppressing pointless logs)
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 8e2eb7b61421ceb063654826941f1a81f6f50bdf..0a16aa193ef24aa8f1716f9e089b8027fa3c0a3c 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -199,6 +199,7 @@ public class PlayerAdvancements {
- 
-             if (advancementholder == null) {
-                 if (!minecraftkey.getNamespace().equals("minecraft")) return; // CraftBukkit
-+                if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressIgnoredAdvancementWarnings) // Purpur
-                 PlayerAdvancements.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", minecraftkey, this.playerSavePath);
-             } else {
-                 this.startProgress(advancementholder, advancementprogress);
-diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index e4b0dc3121101d54394a0c3a413dabf8103b2ea6..a8484b9659f175cc20985bf66082616ceb31df4d 100644
--- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-+++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -336,6 +336,7 @@ public class WorldGenRegion implements WorldGenLevel {
-             return true;
-         } else {
-             // Paper start - Buffer OOB setBlock calls
-+            if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSetBlockFarChunk) // Purpur
-             if (!hasSetFarWarned) {
-             Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + String.valueOf(pos) + ", status: " + String.valueOf(this.generatingStep.targetStatus()) + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
-                 hasSetFarWarned = true;
-diff --git a/src/main/java/net/minecraft/stats/ServerRecipeBook.java b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
-index 5c7484ce2850a2eb698a2183b81134b89b0bbcc7..fef09e71f73f6f24a01289ef05c20a5ffc5fadb1 100644
--- a/src/main/java/net/minecraft/stats/ServerRecipeBook.java
-+++ b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
-@@ -159,6 +159,7 @@ public class ServerRecipeBook extends RecipeBook {
-                 ResourceKey<Recipe<?>> resourcekey = ResourceKey.create(Registries.RECIPE, ResourceLocation.parse(s));
- 
-                 if (!validPredicate.test(resourcekey)) {
-+                    if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressUnrecognizedRecipeErrors) // Purpur
-                     ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", resourcekey);
-                 } else {
-                     handler.accept(resourcekey);
-diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-index 51ae8eddadc87b143b93521a3cef374f1e3a24dc..a7b45602d9d86aec235eef06d252fb6225f17f6e 100644
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-+++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-@@ -265,6 +265,7 @@ public final class CraftLegacy {
-     }
- 
-     static {
-+        if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressInitLegacyMaterialError) // Purpur
-         LOGGER.warn("Initializing Legacy Material Support. Unless you have legacy plugins and/or data this is a bug!"); // Paper - Improve logging and errors; doesn't need to be an error
-         if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
-             new Exception().printStackTrace();
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 3b4a8c9d5a60de94ad79a781414de8de44973e6f..1103935e49081c560b024b87f872e9b8c788bad2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -240,4 +240,15 @@ public class PurpurConfig {
-         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
-         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
-     }
-+
-+    public static boolean loggerSuppressInitLegacyMaterialError = false;
-+    public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
-+    public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
-+    public static boolean loggerSuppressSetBlockFarChunk = false;
-+    private static void loggerSettings() {
-+        loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
-+        loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
-+        loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
-+        loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
-+    }
- }
--- a/patches/unapplied-server/0024-Disable-outdated-build-check.patch
+++ b/patches/unapplied-server/0024-Disable-outdated-build-check.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 15 Dec 2019 12:53:59 -0600
-Subject: [PATCH] Disable outdated build check
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 9ad9239ae0804cc7a4a9ea4a05401b303ae9b372..5bce26e9671aab15ac4bac9a0d00b5184bef74ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -267,7 +267,7 @@ public class Main {
-                     System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
-                 }
- 
-                if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
-+                if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { // Purpur
-                     Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
- 
-                     Calendar deadline = Calendar.getInstance();
--- a/patches/unapplied-server/0025-Giants-AI-settings.patch
+++ b/patches/unapplied-server/0025-Giants-AI-settings.patch
@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 12 May 2019 00:43:12 -0500
-Subject: [PATCH] Giants AI settings
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 48035556b0743f7641d77ec3a42c860f1e1ee6c3..642342592788226999efcb453542f55af71cf193 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -30,8 +30,23 @@ public class Giant extends Monster {
- 
-     @Override
-     protected void registerGoals() {
-        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
-        this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
-+        if (level().purpurConfig.giantHaveAI) {
-+            this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this));
-+            this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
-+            this.goalSelector.addGoal(7, new net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal(this, 1.0D));
-+            this.goalSelector.addGoal(8, new net.minecraft.world.entity.ai.goal.LookAtPlayerGoal(this, net.minecraft.world.entity.player.Player.class, 16.0F));
-+            this.goalSelector.addGoal(8, new net.minecraft.world.entity.ai.goal.RandomLookAroundGoal(this));
-+            this.goalSelector.addGoal(5, new net.minecraft.world.entity.ai.goal.MoveTowardsRestrictionGoal(this, 1.0D));
-+            if (level().purpurConfig.giantHaveHostileAI) {
-+                this.goalSelector.addGoal(2, new net.minecraft.world.entity.ai.goal.MeleeAttackGoal(this, 1.0D, false));
-+                this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
-+                this.targetSelector.addGoal(1, new net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal(this).setAlertOthers(ZombifiedPiglin.class));
-+                this.targetSelector.addGoal(2, new net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal<>(this, net.minecraft.world.entity.player.Player.class, true));
-+                this.targetSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal<>(this, net.minecraft.world.entity.npc.Villager.class, false));
-+                this.targetSelector.addGoal(4, new net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal<>(this, net.minecraft.world.entity.animal.IronGolem.class, true));
-+                this.targetSelector.addGoal(5, new net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal<>(this, net.minecraft.world.entity.animal.Turtle.class, true));
-+            }
-+        }
-     }
- 
-     @Override
-@@ -48,8 +63,34 @@ public class Giant extends Monster {
-         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
-     }
- 
-+    @Override
-+    public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor world, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.EntitySpawnReason spawnReason, @org.jetbrains.annotations.Nullable net.minecraft.world.entity.SpawnGroupData entityData) {
-+        net.minecraft.world.entity.SpawnGroupData groupData = super.finalizeSpawn(world, difficulty, spawnReason, entityData);
-+        if (groupData == null) {
-+            populateDefaultEquipmentSlots(this.random, difficulty);
-+            populateDefaultEquipmentEnchantments(world, this.random, difficulty);
-+        }
-+        return groupData;
-+    }
-+
-+    @Override
-+    protected void populateDefaultEquipmentSlots(net.minecraft.util.RandomSource random, net.minecraft.world.DifficultyInstance difficulty) {
-+        super.populateDefaultEquipmentSlots(this.random, difficulty);
-+        // TODO make configurable
-+        if (random.nextFloat() < (level().getDifficulty() == net.minecraft.world.Difficulty.HARD ? 0.1F : 0.05F)) {
-+            this.setItemSlot(net.minecraft.world.entity.EquipmentSlot.MAINHAND, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.IRON_SWORD));
-+        }
-+    }
-+
-+    @Override
-+    public float getJumpPower() {
-+        // make giants jump as high as everything else relative to their size
-+        // 1.0 makes bottom of feet about as high as their waist when they jump
-+        return level().purpurConfig.giantJumpHeight;
-+    }
-+
-     @Override
-     public float getWalkTargetValue(BlockPos pos, LevelReader world) {
-        return world.getPathfindingCostFromLightLevels(pos);
-+        return super.getWalkTargetValue(pos, world); // Purpur - fix light requirements for natural spawns
-     }
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f6186c65468953756da9c381c6ee712115a244f7..3c3df7767bc97882f53f32de1b4a350f73b16f23 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -635,6 +635,10 @@ public class PurpurWorldConfig {
-     public double giantAttackDamage = 50.0D;
-     public double giantMaxHealth = 100.0D;
-     public double giantScale = 1.0D;
-+    public float giantStepHeight = 2.0F;
-+    public float giantJumpHeight = 1.0F;
-+    public boolean giantHaveAI = false;
-+    public boolean giantHaveHostileAI = false;
-     private void giantSettings() {
-         giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
-         giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
-@@ -652,6 +656,10 @@ public class PurpurWorldConfig {
-         }
-         giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);
-         giantScale = Mth.clamp(getDouble("mobs.giant.attributes.scale", giantScale), 0.0625D, 16.0D);
-+        giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight);
-+        giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
-+        giantHaveAI = getBoolean("mobs.giant.have-ai", giantHaveAI);
-+        giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
-     }
- 
-     public boolean glowSquidRidable = false;
--- a/patches/unapplied-server/0026-Zombie-horse-naturally-spawn.patch
+++ b/patches/unapplied-server/0026-Zombie-horse-naturally-spawn.patch
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 7 Jul 2019 19:52:16 -0500
-Subject: [PATCH] Zombie horse naturally spawn
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1f49d018683fa19f498c8e68dab8a7ddde6cfad0..c05d0d836ced6db6b4a3e85fe0973dd7b1aaad81 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -953,10 +953,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-                 boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper - Configurable spawn chances for skeleton horses
- 
-                 if (flag1) {
-                    SkeletonHorse entityhorseskeleton = (SkeletonHorse) EntityType.SKELETON_HORSE.create(this, EntitySpawnReason.EVENT);
-+                    // Purpur start
-+                    net.minecraft.world.entity.animal.horse.AbstractHorse entityhorseskeleton;
-+                    if (purpurConfig.zombieHorseSpawnChance > 0D && random.nextDouble() <= purpurConfig.zombieHorseSpawnChance) {
-+                        entityhorseskeleton = EntityType.ZOMBIE_HORSE.create(this, EntitySpawnReason.EVENT);
-+                    } else {
-+                        entityhorseskeleton = EntityType.SKELETON_HORSE.create(this, EntitySpawnReason.EVENT);
-+                        if (entityhorseskeleton != null) ((SkeletonHorse) entityhorseskeleton).setTrap(true);
-+                    }
-+                    // Purpur end
- 
-                     if (entityhorseskeleton != null) {
-                        entityhorseskeleton.setTrap(true);
-+                        //entityhorseskeleton.setTrap(true); // Purpur - moved up
-                         entityhorseskeleton.setAge(0);
-                         entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
-                         this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3c3df7767bc97882f53f32de1b4a350f73b16f23..7c7fce74431a52de80a29c0e4ca87b45e2ce892c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1657,6 +1657,7 @@ public class PurpurWorldConfig {
-     public double zombieHorseJumpStrengthMax = 1.0D;
-     public double zombieHorseMovementSpeedMin = 0.2D;
-     public double zombieHorseMovementSpeedMax = 0.2D;
-+    public double zombieHorseSpawnChance = 0.0D;
-     private void zombieHorseSettings() {
-         zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
-         zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
-@@ -1673,6 +1674,7 @@ public class PurpurWorldConfig {
-         zombieHorseJumpStrengthMax = getDouble("mobs.zombie_horse.attributes.jump_strength.max", zombieHorseJumpStrengthMax);
-         zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
-         zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
-+        zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
-     }
- 
-     public boolean zombieVillagerRidable = false;
--- a/patches/unapplied-server/0027-Charged-creeper-naturally-spawn.patch
+++ b/patches/unapplied-server/0027-Charged-creeper-naturally-spawn.patch
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 29 Nov 2019 22:37:44 -0600
-Subject: [PATCH] Charged creeper naturally spawn
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 3ea4763a34447761e73d8643dce8c386fa7501c3..e95afb70fa13f7f2617cbd42b7f5d17b9bc1ec4f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -257,6 +257,14 @@ public class Creeper extends Monster {
-         this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.creeperScale);
-     }
- 
-+    public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor world, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.EntitySpawnReason spawnReason, @Nullable net.minecraft.world.entity.SpawnGroupData entityData) {
-+        double chance = world.getLevel().purpurConfig.creeperChargedChance;
-+        if (chance > 0D && random.nextDouble() <= chance) {
-+            setPowered(true);
-+        }
-+        return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
-+    }
-+
-     @Override
-     protected SoundEvent getHurtSound(DamageSource source) {
-         return SoundEvents.CREEPER_HURT;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7c7fce74431a52de80a29c0e4ca87b45e2ce892c..3ec1852cc481572e87204ca800edae94e6890e05 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -408,6 +408,7 @@ public class PurpurWorldConfig {
-     public boolean creeperControllable = true;
-     public double creeperMaxHealth = 20.0D;
-     public double creeperScale = 1.0D;
-+    public double creeperChargedChance = 0.0D;
-     private void creeperSettings() {
-         creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
-         creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -419,6 +420,7 @@ public class PurpurWorldConfig {
-         }
-         creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
-         creeperScale = Mth.clamp(getDouble("mobs.creeper.attributes.scale", creeperScale), 0.0625D, 16.0D);
-+        creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
-     }
- 
-     public boolean dolphinRidable = false;
--- a/patches/unapplied-server/0028-Rabbit-naturally-spawn-toast-and-killer.patch
+++ b/patches/unapplied-server/0028-Rabbit-naturally-spawn-toast-and-killer.patch
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 31 Aug 2019 17:47:11 -0500
-Subject: [PATCH] Rabbit naturally spawn toast and killer
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 6f3fdf72dd4e8d7399b205818c863e754c898101..b0cdc25f6592d44a3ad3fdf4d461e95887105257 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -469,10 +469,23 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
-         }
- 
-         this.setVariant(entityrabbit_variant);
-+
-+        // Purpur start
-+        if (entityrabbit_variant != Variant.EVIL && world.getLevel().purpurConfig.rabbitNaturalToast > 0D && random.nextDouble() <= world.getLevel().purpurConfig.rabbitNaturalToast) {
-+            setCustomName(Component.translatable("Toast"));
-+        }
-+        // Purpur end
-+
-         return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData);
-     }
- 
-     private static Rabbit.Variant getRandomRabbitVariant(LevelAccessor world, BlockPos pos) {
-+        // Purpur start
-+        Level level = world.getMinecraftWorld();
-+        if (level.purpurConfig.rabbitNaturalKiller > 0D && world.getRandom().nextDouble() <= level.purpurConfig.rabbitNaturalKiller) {
-+            return Rabbit.Variant.EVIL;
-+        }
-+        // Purpur end
-         Holder<Biome> holder = world.getBiome(pos);
-         int i = world.getRandom().nextInt(100);
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3ec1852cc481572e87204ca800edae94e6890e05..0ba770af96809403dd93317dcf5120c7d87bf587 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1105,6 +1105,8 @@ public class PurpurWorldConfig {
-     public boolean rabbitControllable = true;
-     public double rabbitMaxHealth = 3.0D;
-     public double rabbitScale = 1.0D;
-+    public double rabbitNaturalToast = 0.0D;
-+    public double rabbitNaturalKiller = 0.0D;
-     private void rabbitSettings() {
-         rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
-         rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -1116,6 +1118,8 @@ public class PurpurWorldConfig {
-         }
-         rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
-         rabbitScale = Mth.clamp(getDouble("mobs.rabbit.attributes.scale", rabbitScale), 0.0625D, 16.0D);
-+        rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
-+        rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
-     }
- 
-     public boolean ravagerRidable = false;
--- a/patches/unapplied-server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/unapplied-server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Tue, 4 Jun 2019 15:50:08 -0500
-Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
- boots
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index 532f09089b8d6798999cf3f83e852df7479e450e..43c63d203859eaa0999937e2f9254c22510139aa 100644
--- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-@@ -154,6 +154,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
-             this.connection.send(new ClientboundStatusResponsePacket(ping));
-             // CraftBukkit end
-             */
-+            if (MinecraftServer.getServer().getStatus().version().isEmpty()) return; // Purpur - do not respond to pings before we know the protocol version
-             com.destroystokyo.paper.network.StandardPaperServerListPingEventImpl.processRequest(MinecraftServer.getServer(), this.connection);
-             // Paper end
-         }
--- a/patches/unapplied-server/0030-Tulips-change-fox-type.patch
+++ b/patches/unapplied-server/0030-Tulips-change-fox-type.patch
@@ -1,80 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 13 Jul 2019 15:56:22 -0500
-Subject: [PATCH] Tulips change fox type
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index bb98caa1e5ca711293e50ac82a5cad2fa5972db9..355965d88d5ef008111cc72f39e4f8d35741fdfd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -384,6 +384,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
-     }
- 
-     private void setTargetGoals() {
-+        // Purpur start - do not add duplicate goals
-+        this.targetSelector.removeGoal(this.landTargetGoal);
-+        this.targetSelector.removeGoal(this.turtleEggTargetGoal);
-+        this.targetSelector.removeGoal(this.fishTargetGoal);
-+        // Purpur end
-         if (this.getVariant() == Fox.Variant.RED) {
-             this.targetSelector.addGoal(4, this.landTargetGoal);
-             this.targetSelector.addGoal(4, this.turtleEggTargetGoal);
-@@ -413,6 +418,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
- 
-     public void setVariant(Fox.Variant variant) {
-         this.entityData.set(Fox.DATA_TYPE_ID, variant.getId());
-+        this.setTargetGoals(); // Purpur - fix API bug not updating pathfinders on type change
-     }
- 
-     List<UUID> getTrustedUUIDs() {
-@@ -748,6 +754,29 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
-     }
-     // Paper end
- 
-+    // Purpur start
-+    @Override
-+    public net.minecraft.world.InteractionResult mobInteract(Player player, net.minecraft.world.InteractionHand hand) {
-+        if (level().purpurConfig.foxTypeChangesWithTulips) {
-+            ItemStack itemstack = player.getItemInHand(hand);
-+            if (getVariant() == Variant.RED && itemstack.getItem() == Items.WHITE_TULIP) {
-+                setVariant(Variant.SNOW);
-+                if (!player.getAbilities().instabuild) {
-+                    itemstack.shrink(1);
-+                }
-+                return net.minecraft.world.InteractionResult.SUCCESS;
-+            } else if (getVariant() == Variant.SNOW && itemstack.getItem() == Items.ORANGE_TULIP) {
-+                setVariant(Variant.RED);
-+                if (!player.getAbilities().instabuild) {
-+                    itemstack.shrink(1);
-+                }
-+                return net.minecraft.world.InteractionResult.SUCCESS;
-+            }
-+        }
-+        return super.mobInteract(player, hand);
-+    }
-+    // Purpur end
-+
-     @Override
-     // Paper start - Cancellable death event
-     protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(ServerLevel world, DamageSource damageSource) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0ba770af96809403dd93317dcf5120c7d87bf587..37f89fabc286ea07bf6438df7ed7c8d6bcb76d48 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -586,6 +586,7 @@ public class PurpurWorldConfig {
-     public boolean foxControllable = true;
-     public double foxMaxHealth = 10.0D;
-     public double foxScale = 1.0D;
-+    public boolean foxTypeChangesWithTulips = false;
-     private void foxSettings() {
-         foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
-         foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -597,6 +598,7 @@ public class PurpurWorldConfig {
-         }
-         foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
-         foxScale = Mth.clamp(getDouble("mobs.fox.attributes.scale", foxScale), 0.0625D, 16.0D);
-+        foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
-     }
- 
-     public boolean frogRidable = false;
--- a/patches/unapplied-server/0031-Breedable-Polar-Bears.patch
+++ b/patches/unapplied-server/0031-Breedable-Polar-Bears.patch
@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 12 Apr 2024 15:40:12 -0700
-Subject: [PATCH] Breedable Polar Bears
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index f2e205b05213f137ce84b9c5185118f437eec6ff..511d0559743655ed7b43a948fccc2621c906be02 100644
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -99,6 +99,27 @@ public class PolarBear extends Animal implements NeutralMob {
-         this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.polarBearScale);
-     }
- 
-+    public boolean canMate(Animal other) {
-+        if (other == this) {
-+            return false;
-+        } else if (this.isStanding()) {
-+            return false;
-+        } else if (this.getTarget() != null) {
-+            return false;
-+        } else if (!(other instanceof PolarBear)) {
-+            return false;
-+        } else {
-+            PolarBear bear = (PolarBear) other;
-+            if (bear.isStanding()) {
-+                return false;
-+            }
-+            if (bear.getTarget() != null) {
-+                return false;
-+            }
-+            return this.isInLove() && bear.isInLove();
-+        }
-+    }
-+
-     @Nullable
-     @Override
-     public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-@@ -107,7 +128,7 @@ public class PolarBear extends Animal implements NeutralMob {
- 
-     @Override
-     public boolean isFood(ItemStack stack) {
-        return false;
-+        return level().purpurConfig.polarBearBreedableItem != null && stack.getItem() == level().purpurConfig.polarBearBreedableItem; // Purpur
-     }
- 
-     @Override
-@@ -118,6 +139,12 @@ public class PolarBear extends Animal implements NeutralMob {
-         this.goalSelector.addGoal(1, new PolarBear.PolarBearMeleeAttackGoal());
-         this.goalSelector
-             .addGoal(1, new PanicGoal(this, 2.0, polarBear -> polarBear.isBaby() ? DamageTypeTags.PANIC_CAUSES : DamageTypeTags.PANIC_ENVIRONMENTAL_CAUSES));
-+        // Purpur start
-+        if (level().purpurConfig.polarBearBreedableItem != null) {
-+            this.goalSelector.addGoal(2, new net.minecraft.world.entity.ai.goal.BreedGoal(this, 1.0D));
-+            this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, net.minecraft.world.item.crafting.Ingredient.of(level().purpurConfig.polarBearBreedableItem), false));
-+        }
-+        // Purpur end
-         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25));
-         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0));
-         this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 37f89fabc286ea07bf6438df7ed7c8d6bcb76d48..efa453fdde735158b4c6324546ca83bdd2935746 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1073,6 +1073,8 @@ public class PurpurWorldConfig {
-     public boolean polarBearControllable = true;
-     public double polarBearMaxHealth = 30.0D;
-     public double polarBearScale = 1.0D;
-+    public String polarBearBreedableItemString = "";
-+    public Item polarBearBreedableItem = null;
-     private void polarBearSettings() {
-         polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
-         polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
-@@ -1084,6 +1086,9 @@ public class PurpurWorldConfig {
-         }
-         polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);
-         polarBearScale = Mth.clamp(getDouble("mobs.polar_bear.attributes.scale", polarBearScale), 0.0625D, 16.0D);
-+        polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
-+        Item item = BuiltInRegistries.ITEM.getValue(ResourceLocation.parse(polarBearBreedableItemString));
-+        if (item != Items.AIR) polarBearBreedableItem = item;
-     }
- 
-     public boolean pufferfishRidable = false;
--- a/patches/unapplied-server/0032-Chickens-can-retaliate.patch
+++ b/patches/unapplied-server/0032-Chickens-can-retaliate.patch
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 12 Apr 2020 13:19:34 -0500
-Subject: [PATCH] Chickens can retaliate
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 9d3c5340b9e16117fbc63f184fe92cf7ae0998be..798a59046c3ac9a3838f7bcaf7bb21e738b76e44 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -73,6 +73,9 @@ public class Chicken extends Animal {
-     public void initAttributes() {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.chickenMaxHealth);
-         this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.chickenScale);
-+        if (level().purpurConfig.chickenRetaliate) {
-+            this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(2.0D);
-+        }
-     }
-     // Purpur end
- 
-@@ -80,7 +83,7 @@ public class Chicken extends Animal {
-     protected void registerGoals() {
-         this.goalSelector.addGoal(0, new FloatGoal(this));
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-        this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D));
-+        // this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D)); // Purpur - moved down
-         this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.0D, (itemstack) -> {
-             return itemstack.is(ItemTags.CHICKEN_FOOD);
-@@ -89,6 +92,14 @@ public class Chicken extends Animal {
-         this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-         this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
-         this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
-+        // Purpur start
-+        if (level().purpurConfig.chickenRetaliate) {
-+            this.goalSelector.addGoal(1, new net.minecraft.world.entity.ai.goal.MeleeAttackGoal(this, 1.0D, false));
-+            this.targetSelector.addGoal(1, new net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal(this));
-+        } else {
-+            this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D));
-+        }
-+        // Purpur end
-     }
- 
-     @Override
-@@ -97,7 +108,7 @@ public class Chicken extends Animal {
-     }
- 
-     public static AttributeSupplier.Builder createAttributes() {
-        return Animal.createAnimalAttributes().add(Attributes.MAX_HEALTH, 4.0D).add(Attributes.MOVEMENT_SPEED, 0.25D);
-+        return Animal.createAnimalAttributes().add(Attributes.MAX_HEALTH, 4.0D).add(Attributes.MOVEMENT_SPEED, 0.25D).add(Attributes.ATTACK_DAMAGE, 0.0D); // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index efa453fdde735158b4c6324546ca83bdd2935746..dcc8e4880c1bfff1abdc1b542000d61e3378d4f1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -343,6 +343,7 @@ public class PurpurWorldConfig {
-     public boolean chickenControllable = true;
-     public double chickenMaxHealth = 4.0D;
-     public double chickenScale = 1.0D;
-+    public boolean chickenRetaliate = false;
-     private void chickenSettings() {
-         chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
-         chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
-@@ -354,6 +355,7 @@ public class PurpurWorldConfig {
-         }
-         chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
-         chickenScale = Mth.clamp(getDouble("mobs.chicken.attributes.scale", chickenScale), 0.0625D, 16.0D);
-+        chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
-     }
- 
-     public boolean codRidable = false;
--- a/patches/unapplied-server/0033-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/unapplied-server/0033-Add-option-to-set-armorstand-step-height.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 6 Oct 2019 12:46:35 -0500
-Subject: [PATCH] Add option to set armorstand step height
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 163af180a12bf2847d6eab87e1fa77aef7cd3550..1057497963a615ae1aaafa5aac1f53471a00c763 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -300,6 +300,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     public double xOld;
-     public double yOld;
-     public double zOld;
-+    public float maxUpStep; // Purpur
-     public boolean noPhysics;
-     private boolean wasOnFire;
-     public final RandomSource random;
-@@ -5142,7 +5143,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
- 
-     public float maxUpStep() {
-        return 0.0F;
-+        return maxUpStep;
-     }
- 
-     public void onExplosionHit(@Nullable Entity entity) {}
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 70b8023c3badc745f342d5b0ab54699e3923826a..edb0cd90e28016c44b0aaf5c9ed5d7bdbced5295 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -681,6 +681,7 @@ public class ArmorStand extends LivingEntity {
- 
-     @Override
-     public void tick() {
-+        maxUpStep = level().purpurConfig.armorstandStepHeight;
-         // Paper start - Allow ArmorStands not to tick
-         if (!this.canTick) {
-             if (this.noTickPoseDirty) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index dcc8e4880c1bfff1abdc1b542000d61e3378d4f1..149360f01139fa4b14e27e5b34fe3fe7682c7ffc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -91,6 +91,11 @@ public class PurpurWorldConfig {
-         return value.isEmpty() ? fallback : value;
-     }
- 
-+    public float armorstandStepHeight = 0.0F;
-+    private void armorstandSettings() {
-+        armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-+    }
-+
-     public boolean idleTimeoutKick = true;
-     public boolean idleTimeoutTickNearbyEntities = true;
-     public boolean idleTimeoutCountAsSleeping = false;
--- a/patches/unapplied-server/0034-Cat-spawning-options.patch
+++ b/patches/unapplied-server/0034-Cat-spawning-options.patch
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 26 Dec 2019 18:52:55 -0600
-Subject: [PATCH] Cat spawning options
-
-
-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 b0236c7bf9441aa84d3795ffed05dd6099f29636..796dcc0dcf9022b455b8847e045266b8802da0cf 100644
--- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-@@ -27,7 +27,7 @@ public class CatSpawner implements CustomSpawner {
-             if (this.nextTick > 0) {
-                 return 0;
-             } else {
-                this.nextTick = 1200;
-+                this.nextTick = world.purpurConfig.catSpawnDelay; // Purpur
-                 Player player = world.getRandomPlayer();
-                 if (player == null) {
-                     return 0;
-@@ -61,8 +61,12 @@ public class CatSpawner implements CustomSpawner {
- 
-     private int spawnInVillage(ServerLevel world, BlockPos pos) {
-         int i = 48;
-        if (world.getPoiManager().getCountInRange(entry -> entry.is(PoiTypes.HOME), pos, 48, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
-            List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(48.0, 8.0, 48.0));
-+        // Purpur start
-+        int range = world.purpurConfig.catSpawnVillageScanRange;
-+        if (range <= 0) return 0;
-+        if (world.getPoiManager().getCountInRange(entry -> entry.is(PoiTypes.HOME), pos, range, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
-+            List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(range, 8.0, range));
-+        // Purpur end
-             if (list.size() < 5) {
-                 return this.spawnCat(pos, world);
-             }
-@@ -73,7 +77,11 @@ public class CatSpawner implements CustomSpawner {
- 
-     private int spawnInHut(ServerLevel world, BlockPos pos) {
-         int i = 16;
-        List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(16.0, 8.0, 16.0));
-+        // Purpur start
-+        int range = world.purpurConfig.catSpawnSwampHutScanRange;
-+        if (range <= 0) return 0;
-+        List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(range, 8.0, range));
-+        // Purpur end
-         return list.size() < 1 ? this.spawnCat(pos, world) : 0;
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 149360f01139fa4b14e27e5b34fe3fe7682c7ffc..b3284dfbcdc240919776f47a780a824c406c2781 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -312,6 +312,9 @@ public class PurpurWorldConfig {
-     public boolean catControllable = true;
-     public double catMaxHealth = 10.0D;
-     public double catScale = 1.0D;
-+    public int catSpawnDelay = 1200;
-+    public int catSpawnSwampHutScanRange = 16;
-+    public int catSpawnVillageScanRange = 48;
-     private void catSettings() {
-         catRidable = getBoolean("mobs.cat.ridable", catRidable);
-         catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
-@@ -323,6 +326,9 @@ public class PurpurWorldConfig {
-         }
-         catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);
-         catScale = Mth.clamp(getDouble("mobs.cat.attributes.scale", catScale), 0.0625D, 16.0D);
-+        catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
-+        catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
-+        catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
-     }
- 
-     public boolean caveSpiderRidable = false;
--- a/patches/unapplied-server/0035-Cows-eat-mushrooms.patch
+++ b/patches/unapplied-server/0035-Cows-eat-mushrooms.patch
@@ -1,117 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 4 May 2019 01:10:30 -0500
-Subject: [PATCH] Cows eat mushrooms
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 8229a99d4454df64def52bbf686183284d62c900..e6fa66a8c88d4f20a7383e8fd5b3df44718478fa 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -74,7 +74,7 @@ public class Cow extends Animal {
-         this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
-         this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, (itemstack) -> {
-            return itemstack.is(ItemTags.COW_FOOD);
-+            return level().purpurConfig.cowFeedMushrooms > 0 && (itemstack.is(net.minecraft.world.level.block.Blocks.RED_MUSHROOM.asItem()) || itemstack.is(net.minecraft.world.level.block.Blocks.BROWN_MUSHROOM.asItem())) || itemstack.is(ItemTags.COW_FOOD); // Purpur
-         }, false));
-         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D));
-         this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-@@ -136,6 +136,10 @@ public class Cow extends Animal {
- 
-             player.setItemInHand(hand, itemstack1);
-             return InteractionResult.SUCCESS;
-+        // Purpur start - feed mushroom to change to mooshroom
-+        } else if (level().purpurConfig.cowFeedMushrooms > 0 && this.getType() != EntityType.MOOSHROOM && isMushroom(itemstack)) {
-+            return this.feedMushroom(player, itemstack);
-+        // Purpur end
-         } else {
-             return super.mobInteract(player, hand);
-         }
-@@ -151,4 +155,66 @@ public class Cow extends Animal {
-     public EntityDimensions getDefaultDimensions(Pose pose) {
-         return this.isBaby() ? Cow.BABY_DIMENSIONS : super.getDefaultDimensions(pose);
-     }
-+
-+    // Purpur start - feed mushroom to change to mooshroom
-+    private int redMushroomsFed = 0;
-+    private int brownMushroomsFed = 0;
-+
-+    private boolean isMushroom(ItemStack stack) {
-+        return stack.getItem() == net.minecraft.world.level.block.Blocks.RED_MUSHROOM.asItem() || stack.getItem() == net.minecraft.world.level.block.Blocks.BROWN_MUSHROOM.asItem();
-+    }
-+
-+    private int incrementFeedCount(ItemStack stack) {
-+        if (stack.getItem() == net.minecraft.world.level.block.Blocks.RED_MUSHROOM.asItem()) {
-+            return ++redMushroomsFed;
-+        } else {
-+            return ++brownMushroomsFed;
-+        }
-+    }
-+
-+    private InteractionResult feedMushroom(Player player, ItemStack stack) {
-+        level().broadcastEntityEvent(this, (byte) 18); // hearts
-+        playSound(SoundEvents.COW_MILK, 1.0F, 1.0F);
-+        if (incrementFeedCount(stack) < level().purpurConfig.cowFeedMushrooms) {
-+            if (!player.getAbilities().instabuild) {
-+                stack.shrink(1);
-+            }
-+            return InteractionResult.CONSUME; // require 5 mushrooms to transform (prevents mushroom duping)
-+        }
-+        MushroomCow mooshroom = EntityType.MOOSHROOM.create(level(), EntitySpawnReason.CONVERSION);
-+        if (mooshroom == null) {
-+            return InteractionResult.PASS;
-+        }
-+        if (stack.getItem() == net.minecraft.world.level.block.Blocks.BROWN_MUSHROOM.asItem()) {
-+            mooshroom.setVariant(MushroomCow.Variant.BROWN);
-+        } else {
-+            mooshroom.setVariant(MushroomCow.Variant.RED);
-+        }
-+        mooshroom.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
-+        mooshroom.setHealth(this.getHealth());
-+        mooshroom.setAge(getAge());
-+        mooshroom.copyPosition(this);
-+        mooshroom.setYBodyRot(this.yBodyRot);
-+        mooshroom.setYHeadRot(this.getYHeadRot());
-+        mooshroom.yRotO = this.yRotO;
-+        mooshroom.xRotO = this.xRotO;
-+        if (this.hasCustomName()) {
-+            mooshroom.setCustomName(this.getCustomName());
-+        }
-+        if (CraftEventFactory.callEntityTransformEvent(this, mooshroom, org.bukkit.event.entity.EntityTransformEvent.TransformReason.INFECTION).isCancelled()) {
-+            return InteractionResult.PASS;
-+        }
-+        this.level().addFreshEntity(mooshroom);
-+        this.remove(RemovalReason.DISCARDED, org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
-+        if (!player.getAbilities().instabuild) {
-+            stack.shrink(1);
-+        }
-+        for (int i = 0; i < 15; ++i) {
-+            ((ServerLevel) level()).sendParticles(((ServerLevel) level()).players(), null, net.minecraft.core.particles.ParticleTypes.HAPPY_VILLAGER,
-+                    getX() + random.nextFloat(), getY() + (random.nextFloat() * 2), getZ() + random.nextFloat(), 1,
-+                    random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true);
-+        }
-+        return InteractionResult.SUCCESS;
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b3284dfbcdc240919776f47a780a824c406c2781..6eb25a9b4bb634e57f6de015c9a9f2fc78d0b86f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -390,6 +390,7 @@ public class PurpurWorldConfig {
-     public boolean cowControllable = true;
-     public double cowMaxHealth = 10.0D;
-     public double cowScale = 1.0D;
-+    public int cowFeedMushrooms = 0;
-     private void cowSettings() {
-         cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
-         cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
-@@ -401,6 +402,7 @@ public class PurpurWorldConfig {
-         }
-         cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
-         cowScale = Mth.clamp(getDouble("mobs.cow.attributes.scale", cowScale), 0.0625D, 16.0D);
-+        cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
-     }
- 
-     public boolean creakingRidable = false;
--- a/patches/unapplied-server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/unapplied-server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 3 May 2019 23:53:16 -0500
-Subject: [PATCH] Fix cow rotation when shearing mooshroom
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 0005cd7156e46ae790d629d7a985cdace1cc5577..c7039d7d5e38392fef8787f6e245a44842e2f2a3 100644
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -217,6 +217,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-         world.playSound((Player) null, (Entity) this, SoundEvents.MOOSHROOM_SHEAR, shearedSoundCategory, 1.0F, 1.0F);
-         this.convertTo(EntityType.COW, ConversionParams.single(this, false, false), (entitycow) -> {
-             world.sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(0.5D), this.getZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D);
-+            // Purpur start
-+            entitycow.copyPosition(this);
-+            entitycow.yBodyRot = this.yBodyRot;
-+            entitycow.setYHeadRot(this.getYHeadRot());
-+            entitycow.yRotO = this.yRotO;
-+            entitycow.xRotO = this.xRotO;
-+            // Purpur end
-             // Paper start - custom shear drops; moved drop generation to separate method
-             drops.forEach(drop -> {
-                 ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(1.0D), this.getZ(), drop);
--- a/patches/unapplied-server/0037-Pigs-give-saddle-back.patch
+++ b/patches/unapplied-server/0037-Pigs-give-saddle-back.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 12 May 2019 01:14:46 -0500
-Subject: [PATCH] Pigs give saddle back
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 8b9318713764f8429221b4f6fb162018408f5e1e..294545914dec0a06eadb6c2f139222b3f1a6f64c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -180,6 +180,17 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
-     public InteractionResult mobInteract(Player player, InteractionHand hand) {
-         boolean flag = this.isFood(player.getItemInHand(hand));
- 
-+        if (level().purpurConfig.pigGiveSaddleBack && player.isSecondaryUseActive() && !flag && isSaddled() && !isVehicle()) {
-+            this.steering.setSaddle(false);
-+            if (!player.getAbilities().instabuild) {
-+                ItemStack saddle = new ItemStack(Items.SADDLE);
-+                if (!player.getInventory().add(saddle)) {
-+                    player.drop(saddle, false);
-+                }
-+            }
-+            return InteractionResult.SUCCESS;
-+        }
-+
-         if (!flag && this.isSaddled() && !this.isVehicle() && !player.isSecondaryUseActive()) {
-             if (!this.level().isClientSide) {
-                 player.startRiding(this);
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6eb25a9b4bb634e57f6de015c9a9f2fc78d0b86f..419ebb012056d131d6d1b10c8bd72511a1c4df74 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1016,6 +1016,7 @@ public class PurpurWorldConfig {
-     public boolean pigControllable = true;
-     public double pigMaxHealth = 10.0D;
-     public double pigScale = 1.0D;
-+    public boolean pigGiveSaddleBack = false;
-     private void pigSettings() {
-         pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
-         pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
-@@ -1027,6 +1028,7 @@ public class PurpurWorldConfig {
-         }
-         pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
-         pigScale = Mth.clamp(getDouble("mobs.pig.attributes.scale", pigScale), 0.0625D, 16.0D);
-+        pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
-     }
- 
-     public boolean piglinRidable = false;
--- a/patches/unapplied-server/0038-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/unapplied-server/0038-Snowman-drop-and-put-back-pumpkin.patch
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 3 May 2019 23:58:44 -0500
-Subject: [PATCH] Snowman drop and put back pumpkin
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 607c6c5fa38892d8c1d1f9fffc9ccc8617d2140d..bfdb0c52db44e7cc4f37fd42a22c8dae2cc28fac 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -204,6 +204,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-             }
- 
-             return InteractionResult.SUCCESS;
-+        // Purpur start
-+        } else if (level().purpurConfig.snowGolemPutPumpkinBack && !hasPumpkin() && itemstack.getItem() == Blocks.CARVED_PUMPKIN.asItem()) {
-+            setPumpkin(true);
-+            if (!player.getAbilities().instabuild) {
-+                itemstack.shrink(1);
-+            }
-+            return InteractionResult.SUCCESS;
-+        // Purpur end
-         } else {
-             return tryRide(player, hand); // Purpur
-         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 419ebb012056d131d6d1b10c8bd72511a1c4df74..1fa34a6517b4b834354234471f9ed3bcaaf1ee03 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1311,6 +1311,7 @@ public class PurpurWorldConfig {
-     public boolean snowGolemLeaveTrailWhenRidden = false;
-     public double snowGolemMaxHealth = 4.0D;
-     public double snowGolemScale = 1.0D;
-+    public boolean snowGolemPutPumpkinBack = false;
-     private void snowGolemSettings() {
-         snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
-         snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1323,6 +1324,7 @@ public class PurpurWorldConfig {
-         }
-         snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
-         snowGolemScale = Mth.clamp(getDouble("mobs.snow_golem.attributes.scale", snowGolemScale), 0.0625D, 16.0D);
-+        snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
-     }
- 
-     public boolean snifferRidable = false;
--- a/patches/unapplied-server/0039-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/unapplied-server/0039-Ender-dragon-always-drop-full-exp.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 24 Aug 2019 14:42:54 -0500
-Subject: [PATCH] Ender dragon always drop full exp
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 0faae8faeba4300a44b8dadedc73c9f1a4022e4f..f356110850dd71d066243ec29853f547d94e4400 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -732,7 +732,7 @@ public class EnderDragon extends Mob implements Enemy {
-         boolean flag = worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
-         short short0 = 500;
- 
-        if (this.dragonFight != null && !this.dragonFight.hasPreviouslyKilledDragon()) {
-+        if (this.dragonFight != null && (level().purpurConfig.enderDragonAlwaysDropsFullExp || !this.dragonFight.hasPreviouslyKilledDragon())) {
-             short0 = 12000;
-         }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1fa34a6517b4b834354234471f9ed3bcaaf1ee03..a21ced5b26dd176863d26c90c5aa083e64f3cd6a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -525,6 +525,7 @@ public class PurpurWorldConfig {
-     public boolean enderDragonControllable = true;
-     public double enderDragonMaxY = 320D;
-     public double enderDragonMaxHealth = 200.0D;
-+    public boolean enderDragonAlwaysDropsFullExp = false;
-     private void enderDragonSettings() {
-         enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
-         enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -540,6 +541,7 @@ public class PurpurWorldConfig {
-             set("mobs.ender_dragon.attributes.max_health", oldValue);
-         }
-         enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
-+        enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
-     }
- 
-     public boolean endermanRidable = false;
--- a/patches/unapplied-server/0040-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/unapplied-server/0040-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 21 Jun 2019 14:37:10 -0500
-Subject: [PATCH] Allow soil to moisten from water directly under it
-
-
-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 c3dba0c2c94f3804338f86621dc42405e380a6b3..df89b18f0d5d2dad5745ec65bcd9e4a7bf2f1f2b 100644
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -174,7 +174,7 @@ public class FarmBlock extends Block {
-             }
-         }
- 
-        return false;
-+        return ((ServerLevel) world).purpurConfig.farmlandGetsMoistFromBelow && world.getFluidState(pos.relative(Direction.DOWN)).is(FluidTags.WATER); // Purpur;
-         // Paper end - Perf: remove abstract block iteration
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a21ced5b26dd176863d26c90c5aa083e64f3cd6a..1cc5c2f6b2d110174a2c79d26386f96301050834 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -146,6 +146,11 @@ public class PurpurWorldConfig {
-         });
-     }
- 
-+    public boolean farmlandGetsMoistFromBelow = false;
-+    private void farmlandSettings() {
-+        farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
-+    }
-+
-     public boolean turtleEggsBreakFromExpOrbs = false;
-     public boolean turtleEggsBreakFromItems = false;
-     public boolean turtleEggsBreakFromMinecarts = false;
--- a/patches/unapplied-server/0041-Minecart-settings-and-WASD-controls.patch
+++ b/patches/unapplied-server/0041-Minecart-settings-and-WASD-controls.patch
@@ -1,235 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 29 Jun 2019 02:32:40 -0500
-Subject: [PATCH] Minecart settings and WASD controls
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d4ed1dd4e4c56cf40632b0857af82a944579da65..a91a4602b5bc72dc0162fd2d60eebf3a05df4065 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1442,6 +1442,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
-         if (this.isInvulnerableTo(world, source)) {
-             return false;
-         } else {
-+            if (source.is(DamageTypeTags.IS_FALL) && getRootVehicle() instanceof net.minecraft.world.entity.vehicle.AbstractMinecart && level().purpurConfig.minecartControllable && !level().purpurConfig.minecartControllableFallDamage) return false; // Purpur
-             boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && source.is(DamageTypeTags.IS_FALL);
- 
-             if (!flag && this.spawnInvulnerableTime > 0 && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
-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 cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..b31940441596079aae1cd2a38b9d22be18358448 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -92,6 +92,10 @@ public abstract class AbstractMinecart extends VehicleEntity {
-     private double flyingY = 0.95;
-     private double flyingZ = 0.95;
-     public Double maxSpeed;
-+    // Purpur start
-+    public double storedMaxSpeed;
-+    public boolean isNewBehavior;
-+    // Purpur end
-     // CraftBukkit end
-     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
- 
-@@ -100,8 +104,13 @@ public abstract class AbstractMinecart extends VehicleEntity {
-         this.blocksBuilding = true;
-         if (AbstractMinecart.useExperimentalMovement(world)) {
-             this.behavior = new NewMinecartBehavior(this);
-+            this.isNewBehavior = true; // Purpur
-         } else {
-             this.behavior = new OldMinecartBehavior(this);
-+            // Purpur start
-+            this.isNewBehavior = false;
-+            maxSpeed = storedMaxSpeed = world.purpurConfig.minecartMaxSpeed;
-+            // Purpur end
-         }
- 
-     }
-@@ -289,6 +298,14 @@ public abstract class AbstractMinecart extends VehicleEntity {
- 
-     @Override
-     public void tick() {
-+        // Purpur start
-+        if (!this.isNewBehavior) {
-+            if (storedMaxSpeed != level().purpurConfig.minecartMaxSpeed) {
-+                maxSpeed = storedMaxSpeed = level().purpurConfig.minecartMaxSpeed;
-+            }
-+        }
-+        // Purpur end
-+
-         // CraftBukkit start
-         double prevX = this.getX();
-         double prevY = this.getY();
-@@ -426,16 +443,62 @@ public abstract class AbstractMinecart extends VehicleEntity {
-         this.behavior.moveAlongTrack(world);
-     }
- 
-+    // Purpur start
-+    private Double lastSpeed;
-+
-+    public double getControllableSpeed() {
-+        BlockState blockState = level().getBlockState(this.blockPosition());
-+        if (!blockState.isSolid()) {
-+            blockState = level().getBlockState(this.blockPosition().relative(Direction.DOWN));
-+        }
-+        Double speed = level().purpurConfig.minecartControllableBlockSpeeds.get(blockState.getBlock());
-+        if (!blockState.isSolid()) {
-+            speed = lastSpeed;
-+        }
-+        if (speed == null) {
-+            speed = level().purpurConfig.minecartControllableBaseSpeed;
-+        }
-+        return lastSpeed = speed;
-+    }
-+    // Purpur end
-+
-     protected void comeOffTrack(ServerLevel world) {
-         double d0 = this.getMaxSpeed(world);
-         Vec3 vec3d = this.getDeltaMovement();
- 
-         this.setDeltaMovement(Mth.clamp(vec3d.x, -d0, d0), vec3d.y, Mth.clamp(vec3d.z, -d0, d0));
-+
-+        // Purpur start
-+        if (level().purpurConfig.minecartControllable && !isInWater() && !isInLava() && !passengers.isEmpty()) {
-+            Entity passenger = passengers.get(0);
-+            if (passenger instanceof Player) {
-+                Player player = (Player) passenger;
-+                if (player.jumping && this.onGround) {
-+                    setDeltaMovement(new Vec3(getDeltaMovement().x, level().purpurConfig.minecartControllableHopBoost, getDeltaMovement().z));
-+                }
-+                if (player.zza != 0.0F) {
-+                    Vector velocity = player.getBukkitEntity().getEyeLocation().getDirection().normalize().multiply(getControllableSpeed());
-+                    if (player.zza < 0.0) {
-+                        velocity.multiply(-0.5);
-+                    }
-+                    setDeltaMovement(new Vec3(velocity.getX(), getDeltaMovement().y, velocity.getZ()));
-+                }
-+                this.setYRot(passenger.getYRot() - 90);
-+                maxUpStep = level().purpurConfig.minecartControllableStepHeight;
-+            } else {
-+                maxUpStep = 0.0F;
-+            }
-+        } else {
-+            maxUpStep = 0.0F;
-+        }
-+        // Purpur end
-+
-         if (this.onGround()) {
-             // CraftBukkit start - replace magic numbers with our variables
-             this.setDeltaMovement(new Vec3(this.getDeltaMovement().x * this.derailedX, this.getDeltaMovement().y * this.derailedY, this.getDeltaMovement().z * this.derailedZ));
-             // CraftBukkit end
-         }
-+        else if (level().purpurConfig.minecartControllable) setDeltaMovement(new Vec3(getDeltaMovement().x * derailedX, getDeltaMovement().y, getDeltaMovement().z * derailedZ)); // Purpur
- 
-         this.move(MoverType.SELF, this.getDeltaMovement());
-         if (!this.onGround()) {
-diff --git a/src/main/java/net/minecraft/world/item/MinecartItem.java b/src/main/java/net/minecraft/world/item/MinecartItem.java
-index 7153d9ed12276a0f2d8b8a17c79734aa25ed1fa5..dc49ea6454e04ae8ec68af12c4bf2ff022540671 100644
--- a/src/main/java/net/minecraft/world/item/MinecartItem.java
-+++ b/src/main/java/net/minecraft/world/item/MinecartItem.java
-@@ -35,8 +35,9 @@ public class MinecartItem extends Item {
-         BlockState iblockdata = world.getBlockState(blockposition);
- 
-         if (!iblockdata.is(BlockTags.RAILS)) {
-            return InteractionResult.FAIL;
-        } else {
-+            if (!world.purpurConfig.minecartPlaceAnywhere) return InteractionResult.FAIL; // Purpur
-+            if (iblockdata.isSolid()) blockposition = blockposition.relative(context.getClickedFace());
-+        } // else { // Purpur - place minecarts anywhere
-             ItemStack itemstack = context.getItemInHand();
-             RailShape blockpropertytrackposition = iblockdata.getBlock() instanceof BaseRailBlock ? (RailShape) iblockdata.getValue(((BaseRailBlock) iblockdata.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
-             double d0 = 0.0D;
-@@ -80,6 +81,6 @@ public class MinecartItem extends Item {
-                 itemstack.shrink(1);
-                 return InteractionResult.SUCCESS;
-             }
-        }
-+        // } // Purpur - place minecarts anywhere
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 99fd67a78539133adf78d65e2c520ff3dd260301..6b987ee220d94b482d2aeb4ff6bf271853605dc1 100644
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -99,7 +99,7 @@ public abstract class BlockBehaviour implements FeatureElement {
-     protected final float jumpFactor;
-     protected final boolean dynamicShape;
-     protected final FeatureFlagSet requiredFeatures;
-    protected final BlockBehaviour.Properties properties;
-+    public final BlockBehaviour.Properties properties; // Purpur - protected -> public
-     protected final Optional<ResourceKey<LootTable>> drops;
-     protected final String descriptionId;
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1cc5c2f6b2d110174a2c79d26386f96301050834..21e3931d64d32e69b8ba6f7e6d1a9bf044c7c9a8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -96,6 +96,68 @@ public class PurpurWorldConfig {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-     }
- 
-+    public double minecartMaxSpeed = 0.4D;
-+    public boolean minecartPlaceAnywhere = false;
-+    public boolean minecartControllable = false;
-+    public float minecartControllableStepHeight = 1.0F;
-+    public double minecartControllableHopBoost = 0.5D;
-+    public boolean minecartControllableFallDamage = true;
-+    public double minecartControllableBaseSpeed = 0.1D;
-+    public Map<Block, Double> minecartControllableBlockSpeeds = new HashMap<>();
-+    private void minecartSettings() {
-+        if (PurpurConfig.version < 12) {
-+            boolean oldBool = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", minecartPlaceAnywhere);
-+            set("gameplay-mechanics.controllable-minecarts.place-anywhere", null);
-+            set("gameplay-mechanics.minecart.place-anywhere", oldBool);
-+            oldBool = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", minecartControllable);
-+            set("gameplay-mechanics.controllable-minecarts.enabled", null);
-+            set("gameplay-mechanics.minecart.controllable.enabled", oldBool);
-+            double oldDouble = getDouble("gameplay-mechanics.controllable-minecarts.step-height", minecartControllableStepHeight);
-+            set("gameplay-mechanics.controllable-minecarts.step-height", null);
-+            set("gameplay-mechanics.minecart.controllable.step-height", oldDouble);
-+            oldDouble = getDouble("gameplay-mechanics.controllable-minecarts.hop-boost", minecartControllableHopBoost);
-+            set("gameplay-mechanics.controllable-minecarts.hop-boost", null);
-+            set("gameplay-mechanics.minecart.controllable.hop-boost", oldDouble);
-+            oldBool = getBoolean("gameplay-mechanics.controllable-minecarts.fall-damage", minecartControllableFallDamage);
-+            set("gameplay-mechanics.controllable-minecarts.fall-damage", null);
-+            set("gameplay-mechanics.minecart.controllable.fall-damage", oldBool);
-+            oldDouble = getDouble("gameplay-mechanics.controllable-minecarts.base-speed", minecartControllableBaseSpeed);
-+            set("gameplay-mechanics.controllable-minecarts.base-speed", null);
-+            set("gameplay-mechanics.minecart.controllable.base-speed", oldDouble);
-+            ConfigurationSection section = getConfigurationSection("gameplay-mechanics.controllable-minecarts.block-speed");
-+            if (section != null) {
-+                for (String key : section.getKeys(false)) {
-+                    if ("grass-block".equals(key)) key = "grass_block"; // oopsie
-+                    oldDouble = section.getDouble(key, minecartControllableBaseSpeed);
-+                    set("gameplay-mechanics.controllable-minecarts.block-speed." + key, null);
-+                    set("gameplay-mechanics.minecart.controllable.block-speed." + key, oldDouble);
-+                }
-+                set("gameplay-mechanics.controllable-minecarts.block-speed", null);
-+            }
-+            set("gameplay-mechanics.controllable-minecarts", null);
-+        }
-+
-+        minecartMaxSpeed = getDouble("gameplay-mechanics.minecart.max-speed", minecartMaxSpeed);
-+        minecartPlaceAnywhere = getBoolean("gameplay-mechanics.minecart.place-anywhere", minecartPlaceAnywhere);
-+        minecartControllable = getBoolean("gameplay-mechanics.minecart.controllable.enabled", minecartControllable);
-+        minecartControllableStepHeight = (float) getDouble("gameplay-mechanics.minecart.controllable.step-height", minecartControllableStepHeight);
-+        minecartControllableHopBoost = getDouble("gameplay-mechanics.minecart.controllable.hop-boost", minecartControllableHopBoost);
-+        minecartControllableFallDamage = getBoolean("gameplay-mechanics.minecart.controllable.fall-damage", minecartControllableFallDamage);
-+        minecartControllableBaseSpeed = getDouble("gameplay-mechanics.minecart.controllable.base-speed", minecartControllableBaseSpeed);
-+        ConfigurationSection section = getConfigurationSection("gameplay-mechanics.minecart.controllable.block-speed");
-+        if (section != null) {
-+            for (String key : section.getKeys(false)) {
-+                Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(key));
-+                if (block != Blocks.AIR) {
-+                    minecartControllableBlockSpeeds.put(block, section.getDouble(key, minecartControllableBaseSpeed));
-+                }
-+            }
-+        } else {
-+            set("gameplay-mechanics.minecart.controllable.block-speed.grass_block", 0.3D);
-+            set("gameplay-mechanics.minecart.controllable.block-speed.stone", 0.5D);
-+        }
-+    }
-+
-     public boolean idleTimeoutKick = true;
-     public boolean idleTimeoutTickNearbyEntities = true;
-     public boolean idleTimeoutCountAsSleeping = false;
--- a/patches/unapplied-server/0042-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/unapplied-server/0042-Disable-loot-drops-on-death-by-cramming.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Wed, 3 Jul 2019 23:58:31 -0500
-Subject: [PATCH] Disable loot drops on death by cramming
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1077eae6e0952d09410518a856ebece808aefef5..af017da528924bae0542dd0e59d23c3bf59aa7b3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1927,6 +1927,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-         this.dropEquipment(world); // CraftBukkit - from below
-         if (this.shouldDropLoot() && world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
-+            if (!(damageSource.is(net.minecraft.world.damagesource.DamageTypes.CRAMMING) && level().purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
-             this.dropFromLootTable(world, damageSource, flag);
-             // Paper start
-             final boolean prev = this.clearEquipmentSlots;
-@@ -1935,6 +1936,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             // Paper end
-             this.dropCustomDeathLoot(world, damageSource, flag);
-             this.clearEquipmentSlots = prev; // Paper
-+            } // Purpur
-         }
-         // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
-         org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, damageSource, this.drops, () -> {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 21e3931d64d32e69b8ba6f7e6d1a9bf044c7c9a8..983523dfff2773799640347ff047e600fb25044e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -96,6 +96,11 @@ public class PurpurWorldConfig {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-     }
- 
-+    public boolean disableDropsOnCrammingDeath = false;
-+    private void miscGameplayMechanicsSettings() {
-+        disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
-+    }
-+
-     public double minecartMaxSpeed = 0.4D;
-     public boolean minecartPlaceAnywhere = false;
-     public boolean minecartControllable = false;
--- a/patches/unapplied-server/0043-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/unapplied-server/0043-Option-to-toggle-milk-curing-bad-omen.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Wed, 10 Jul 2019 20:43:05 -0500
-Subject: [PATCH] Option to toggle milk curing bad omen
-
-
-diff --git a/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java b/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
-index 0651c2af040e3f248860cfb3c5effce91589380e..d884df481b4bbb978113a4ac7a1feac31cf2f951 100644
--- a/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
-+++ b/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
-@@ -24,6 +24,12 @@ public record ClearAllStatusEffectsConsumeEffect() implements ConsumeEffect {
-     @Override
-     // CraftBukkit start
-     public boolean apply(Level world, ItemStack itemstack, LivingEntity entityliving, EntityPotionEffectEvent.Cause cause) {
-+        // Purpur start
-+        net.minecraft.world.effect.MobEffectInstance badOmen = entityliving.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN);
-+        if (!world.purpurConfig.milkCuresBadOmen && itemstack.is(net.minecraft.world.item.Items.MILK_BUCKET) && badOmen != null) {
-+            return entityliving.removeAllEffects(cause) && entityliving.addEffect(badOmen);
-+        }
-+        // Purpur end
-         return entityliving.removeAllEffects(cause);
-         // CraftBukkit end
-     }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 983523dfff2773799640347ff047e600fb25044e..6daa99bb60723af0eb38b625ab0cd24d33d7552a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -97,8 +97,10 @@ public class PurpurWorldConfig {
-     }
- 
-     public boolean disableDropsOnCrammingDeath = false;
-+    public boolean milkCuresBadOmen = true;
-     private void miscGameplayMechanicsSettings() {
-         disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
-+        milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
-     }
- 
-     public double minecartMaxSpeed = 0.4D;
--- a/patches/unapplied-server/0044-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/unapplied-server/0044-Skip-events-if-there-s-no-listeners.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 4 Apr 2020 03:07:59 -0500
-Subject: [PATCH] Skip events if there's no listeners
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 64bf4444ffba25cb40743a32267aa790ad1738f9..1210305bcfc8a1158dbdc3c21647502a01b138a3 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -515,6 +515,7 @@ public class Commands {
-     private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
-         // Paper end - Perf: Async command map building
-         new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, true).callEvent(); // Paper - Brigadier API
-+        if (PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - skip all this crap if there's nothing listening
-         PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
-         event.getPlayer().getServer().getPluginManager().callEvent(event);
- 
-@@ -525,6 +526,7 @@ public class Commands {
-             }
-         }
-         // CraftBukkit end
-+        } // Purpur - skip event
-         player.connection.send(new ClientboundCommandsPacket(rootcommandnode));
-     }
- 
--- a/patches/unapplied-server/0045-Add-permission-for-F3-N-debug.patch
+++ b/patches/unapplied-server/0045-Add-permission-for-F3-N-debug.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 28 Dec 2019 04:21:54 -0600
-Subject: [PATCH] Add permission for F3+N debug
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 595302e0177824c1e3ad54e9a088337eeb2d872b..73c83770e1acd6c57742405a04ffa7a733aea4f6 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1108,6 +1108,7 @@ public abstract class PlayerList {
-             } else {
-                 b0 = (byte) (24 + permissionLevel);
-             }
-+            if (b0 < 28 && player.getBukkitEntity().hasPermission("purpur.debug.f3n")) b0 = 28; // Purpur
- 
-             player.connection.send(new ClientboundEntityEventPacket(player, b0));
-         }
--- a/patches/unapplied-server/0046-Configurable-TPS-Catchup.patch
+++ b/patches/unapplied-server/0046-Configurable-TPS-Catchup.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 26 Mar 2020 19:06:22 -0500
-Subject: [PATCH] Configurable TPS Catchup
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 85f5f8a30053cae087b223f0d80432c5318e67d6..f6ad220e3e228e978c8b635064e8d5bf65ac5a89 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1345,7 +1345,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                         this.mayHaveDelayedTasks = true;
-                         this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
-                         // Pufferfish start - tps catchup
-                        if (!gg.pufferfish.pufferfish.PufferfishConfig.tpsCatchup) {
-+                        if (!gg.pufferfish.pufferfish.PufferfishConfig.tpsCatchup || !gg.pufferfish.pufferfish.PufferfishConfig.tpsCatchup) { // Purpur
-                             this.nextTickTimeNanos = currentTime + i;
-                             this.delayedTasksMaxNextTickTimeNanos = nextTickTimeNanos;
-                         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 1103935e49081c560b024b87f872e9b8c788bad2..c8e7e6333d20ca976ed74d839ccfaebdc02e5167 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -251,4 +251,9 @@ public class PurpurConfig {
-         loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
-         loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
-     }
-+
-+    public static boolean tpsCatchup = true;
-+    private static void tpsCatchup() {
-+        tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
-+    }
- }
--- a/patches/unapplied-server/0047-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/unapplied-server/0047-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 19 Mar 2020 19:39:34 -0500
-Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-index 322733266fdca8ce43434a8ffea304c51794bcbb..489c26423a7f5bc9da45d247de57ec989cc74119 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-@@ -69,7 +69,7 @@ public class ThrownTrident extends AbstractArrow {
-         Entity entity = this.getOwner();
-         byte b0 = (Byte) this.entityData.get(ThrownTrident.ID_LOYALTY);
- 
-        if (b0 > 0 && (this.dealtDamage || this.isNoPhysics()) && entity != null) {
-+        if (b0 > 0 && (this.dealtDamage || this.isNoPhysics() || (level().purpurConfig.tridentLoyaltyVoidReturnHeight < 0.0D && getY() < level().purpurConfig.tridentLoyaltyVoidReturnHeight)) && entity != null) { // Purpur
-             if (!this.isAcceptibleReturnOwner()) {
-                 Level world = this.level();
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6daa99bb60723af0eb38b625ab0cd24d33d7552a..bdf391eda89bc061353c0fd72ab5a9c5fe85e55e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -98,9 +98,11 @@ public class PurpurWorldConfig {
- 
-     public boolean disableDropsOnCrammingDeath = false;
-     public boolean milkCuresBadOmen = true;
-+    public double tridentLoyaltyVoidReturnHeight = 0.0D;
-     private void miscGameplayMechanicsSettings() {
-         disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
-         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
-+        tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
-     }
- 
-     public double minecartMaxSpeed = 0.4D;
--- a/patches/unapplied-server/0048-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/unapplied-server/0048-Add-enderman-and-creeper-griefing-controls.patch
@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 26 Apr 2020 16:28:38 -0500
-Subject: [PATCH] Add enderman and creeper griefing controls
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index e95afb70fa13f7f2617cbd42b7f5d17b9bc1ec4f..54225cfd13e7b62e80f24b4885c720d6e6ce8700 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -362,7 +362,7 @@ public class Creeper extends Monster {
-             if (!event.isCancelled()) {
-             // CraftBukkit end
-             this.dead = true;
-            worldserver.explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit // Paper - fix DamageSource API (revert to vanilla, no, just no, don't change this)
-+            worldserver.explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), worldserver.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING) && level().purpurConfig.creeperAllowGriefing ? Level.ExplosionInteraction.MOB : Level.ExplosionInteraction.NONE); // CraftBukkit // Paper - fix DamageSource API (revert to vanilla, no, just no, don't change this) // Purpur
-             this.spawnLingeringCloud();
-             this.triggerOnDeathMobEffects(worldserver, Entity.RemovalReason.KILLED);
-             this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index f1d4e32085085b06a07fec88737e1ad9e9da2adf..04fdefe4c38ef9ed3001f95b34d1632944fcae85 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -520,6 +520,7 @@ public class EnderMan extends Monster implements NeutralMob {
- 
-         @Override
-         public boolean canUse() {
-+            if (!enderman.level().purpurConfig.endermanAllowGriefing) return false; // Purpur
-             return this.enderman.getCarriedBlock() == null ? false : (!getServerLevel((Entity) this.enderman).getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0);
-         }
- 
-@@ -565,6 +566,7 @@ public class EnderMan extends Monster implements NeutralMob {
- 
-         @Override
-         public boolean canUse() {
-+            if (!enderman.level().purpurConfig.endermanAllowGriefing) return false; // Purpur
-             return this.enderman.getCarriedBlock() != null ? false : (!getServerLevel((Entity) this.enderman).getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(20)) == 0);
-         }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bdf391eda89bc061353c0fd72ab5a9c5fe85e55e..b33ab2fc455c212284ef50cfecc778000741ead5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -500,6 +500,7 @@ public class PurpurWorldConfig {
-     public double creeperMaxHealth = 20.0D;
-     public double creeperScale = 1.0D;
-     public double creeperChargedChance = 0.0D;
-+    public boolean creeperAllowGriefing = true;
-     private void creeperSettings() {
-         creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
-         creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -512,6 +513,7 @@ public class PurpurWorldConfig {
-         creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
-         creeperScale = Mth.clamp(getDouble("mobs.creeper.attributes.scale", creeperScale), 0.0625D, 16.0D);
-         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
-+        creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
-     }
- 
-     public boolean dolphinRidable = false;
-@@ -625,6 +627,7 @@ public class PurpurWorldConfig {
-     public boolean endermanControllable = true;
-     public double endermanMaxHealth = 40.0D;
-     public double endermanScale = 1.0D;
-+    public boolean endermanAllowGriefing = true;
-     private void endermanSettings() {
-         endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
-         endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -636,6 +639,7 @@ public class PurpurWorldConfig {
-         }
-         endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
-         endermanScale = Mth.clamp(getDouble("mobs.enderman.attributes.scale", endermanScale), 0.0625D, 16.0D);
-+        endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
-     }
- 
-     public boolean endermiteRidable = false;
--- a/patches/unapplied-server/0049-Villagers-follow-emerald-blocks.patch
+++ b/patches/unapplied-server/0049-Villagers-follow-emerald-blocks.patch
@@ -1,141 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 29 Nov 2019 22:10:12 -0600
-Subject: [PATCH] Villagers follow emerald blocks
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
-index 157fe8979c780300b6f72cbaa17729031e3b386d..0bb08af954d224a2b4404615bee720ac4bdbac55 100644
--- a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
-@@ -161,7 +161,7 @@ public class DefaultAttributes {
-         .put(EntityType.VILLAGER, Villager.createAttributes().build())
-         .put(EntityType.VINDICATOR, Vindicator.createAttributes().build())
-         .put(EntityType.WARDEN, Warden.createAttributes().build())
-        .put(EntityType.WANDERING_TRADER, Mob.createMobAttributes().build())
-+        .put(EntityType.WANDERING_TRADER, net.minecraft.world.entity.npc.WanderingTrader.createAttributes().build()) // Purpur
-         .put(EntityType.WITCH, Witch.createAttributes().build())
-         .put(EntityType.WITHER, WitherBoss.createAttributes().build())
-         .put(EntityType.WITHER_SKELETON, AbstractSkeleton.createAttributes().build())
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
-index 84ab90dd1fe693da71732533ccff940c1007e1b6..179fdf7b7f68db610925a9d7b88879289b1b98b8 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
-@@ -67,7 +67,7 @@ public class TemptGoal extends Goal {
-     }
- 
-     private boolean shouldFollow(LivingEntity entity) {
-        return this.items.test(entity.getMainHandItem()) || this.items.test(entity.getOffhandItem());
-+        return (this.items.test(entity.getMainHandItem()) || this.items.test(entity.getOffhandItem())) && (!(this.mob instanceof net.minecraft.world.entity.npc.Villager villager) || !villager.isSleeping()); // Purpur Fix #512
-     }
- 
-     @Override
-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 5f656fc726a1dc5f42657095a2f2b7cf85b92d7c..6c74cf1dea99b3b967b8c3d76f405f823c881fb9 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;
- // CraftBukkit end
- 
- public abstract class AbstractVillager extends AgeableMob implements InventoryCarrier, Npc, Merchant {
-+    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
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 9505402564893b3046b86f95fa1e34a64ac98e8e..f0b0341a256f0e673bf18d25c6f9616f3afaa078 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -177,6 +177,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-     @Override
-     protected void registerGoals() {
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
-+        if (level().purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, TEMPT_ITEMS, false));
-     }
-     // Purpur end
- 
-@@ -184,6 +185,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-     public void initAttributes() {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.villagerMaxHealth);
-         this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.villagerScale);
-+        this.getAttribute(Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.villagerTemptRange); // Purpur
-     }
- 
-     @Override
-@@ -247,7 +249,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-     }
- 
-     public static AttributeSupplier.Builder createAttributes() {
-        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.5D);
-+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.5D).add(Attributes.TEMPT_RANGE, 10.0D); // Purpur - add TEMPT_RANGE
-     }
- 
-     public boolean assignProfessionWhenSpawned() {
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index f741aca818bc983b034b3ac9864c1d71c714f9b4..a821a7bc7de7458ceb8afdb61bde32f74534f012 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -92,8 +92,15 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-     @Override
-     public void initAttributes() {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.wanderingTraderMaxHealth);
-+        this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.wanderingTraderTemptRange); // Purpur
-     }
- 
-+    // Purpur start
-+    public static net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder createAttributes() {
-+        return Mob.createMobAttributes().add(net.minecraft.world.entity.ai.attributes.Attributes.TEMPT_RANGE, 10.0D);
-+    }
-+    // Purpur end
-+
-     @Override
-     protected void registerGoals() {
-         this.goalSelector.addGoal(0, new FloatGoal(this));
-@@ -114,6 +121,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-         this.goalSelector.addGoal(1, new PanicGoal(this, 0.5D));
-         this.goalSelector.addGoal(1, new LookAtTradingPlayerGoal(this));
-         this.goalSelector.addGoal(2, new WanderingTrader.WanderToPositionGoal(this, 2.0D, 0.35D));
-+        if (level().purpurConfig.wanderingTraderFollowEmeraldBlock) this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, TEMPT_ITEMS, false)); // Purpur
-         this.goalSelector.addGoal(4, new MoveTowardsRestrictionGoal(this, 0.35D));
-         this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
-         this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b33ab2fc455c212284ef50cfecc778000741ead5..b81790ec5a7e4b73fbef52229844506b072dfa0d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1588,6 +1588,8 @@ public class PurpurWorldConfig {
-     public boolean villagerControllable = true;
-     public double villagerMaxHealth = 20.0D;
-     public double villagerScale = 1.0D;
-+    public boolean villagerFollowEmeraldBlock = false;
-+    public double villagerTemptRange = 10.0D;
-     private void villagerSettings() {
-         villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
-         villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1599,6 +1601,8 @@ public class PurpurWorldConfig {
-         }
-         villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
-         villagerScale = Mth.clamp(getDouble("mobs.villager.attributes.scale", villagerScale), 0.0625D, 16.0D);
-+        villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
-+        villagerTemptRange = getDouble("mobs.villager.attributes.tempt_range", villagerTemptRange);
-     }
- 
-     public boolean vindicatorRidable = false;
-@@ -1624,6 +1628,8 @@ public class PurpurWorldConfig {
-     public boolean wanderingTraderControllable = true;
-     public double wanderingTraderMaxHealth = 20.0D;
-     public double wanderingTraderScale = 1.0D;
-+    public boolean wanderingTraderFollowEmeraldBlock = false;
-+    public double wanderingTraderTemptRange = 10.0D;
-     private void wanderingTraderSettings() {
-         wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
-         wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1635,6 +1641,8 @@ public class PurpurWorldConfig {
-         }
-         wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
-         wanderingTraderScale = Mth.clamp(getDouble("mobs.wandering_trader.attributes.scale", wanderingTraderScale), 0.0625D, 16.0D);
-+        wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
-+        wanderingTraderTemptRange = getDouble("mobs.wandering_trader.attributes.tempt_range", wanderingTraderTemptRange);
-     }
- 
-     public boolean wardenRidable = false;
--- a/patches/unapplied-server/0050-Allow-leashing-villagers.patch
+++ b/patches/unapplied-server/0050-Allow-leashing-villagers.patch
@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 3 Oct 2019 18:08:03 -0500
-Subject: [PATCH] Allow leashing villagers
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1057497963a615ae1aaafa5aac1f53471a00c763..35c6cc4d0d76becba693d056534a9437bd3364e4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3093,6 +3093,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-         if (this.isAlive() && this instanceof Leashable leashable) {
-             if (leashable.getLeashHolder() == player) {
-                 if (!this.level().isClientSide()) {
-+                    if (hand == InteractionHand.OFF_HAND && (level().purpurConfig.villagerCanBeLeashed || level().purpurConfig.wanderingTraderCanBeLeashed) && this instanceof net.minecraft.world.entity.npc.AbstractVillager) return InteractionResult.CONSUME; // Purpur
-                     // CraftBukkit start - fire PlayerUnleashEntityEvent
-                     // Paper start - Expand EntityUnleashEvent
-                     org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials());
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index f0b0341a256f0e673bf18d25c6f9616f3afaa078..394c8667cfe57fa1fba93231a1ebb5be6dc63c63 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -179,6 +179,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
-         if (level().purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, TEMPT_ITEMS, false));
-     }
-+
-+    @Override
-+    public boolean canBeLeashed() {
-+        return level().purpurConfig.villagerCanBeLeashed;
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index a821a7bc7de7458ceb8afdb61bde32f74534f012..738df68a988a8ba428bf2c74a12cb8d9dd525bee 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -87,6 +87,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-     public boolean isControllable() {
-         return level().purpurConfig.wanderingTraderControllable;
-     }
-+
-+    @Override
-+    public boolean canBeLeashed() {
-+        return level().purpurConfig.wanderingTraderCanBeLeashed;
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b81790ec5a7e4b73fbef52229844506b072dfa0d..1b96a84a1c81c075aa5f7308b89d396a4578be33 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1590,6 +1590,7 @@ public class PurpurWorldConfig {
-     public double villagerScale = 1.0D;
-     public boolean villagerFollowEmeraldBlock = false;
-     public double villagerTemptRange = 10.0D;
-+    public boolean villagerCanBeLeashed = false;
-     private void villagerSettings() {
-         villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
-         villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1603,6 +1604,7 @@ public class PurpurWorldConfig {
-         villagerScale = Mth.clamp(getDouble("mobs.villager.attributes.scale", villagerScale), 0.0625D, 16.0D);
-         villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
-         villagerTemptRange = getDouble("mobs.villager.attributes.tempt_range", villagerTemptRange);
-+        villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
-     }
- 
-     public boolean vindicatorRidable = false;
-@@ -1630,6 +1632,7 @@ public class PurpurWorldConfig {
-     public double wanderingTraderScale = 1.0D;
-     public boolean wanderingTraderFollowEmeraldBlock = false;
-     public double wanderingTraderTemptRange = 10.0D;
-+    public boolean wanderingTraderCanBeLeashed = false;
-     private void wanderingTraderSettings() {
-         wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
-         wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1643,6 +1646,7 @@ public class PurpurWorldConfig {
-         wanderingTraderScale = Mth.clamp(getDouble("mobs.wandering_trader.attributes.scale", wanderingTraderScale), 0.0625D, 16.0D);
-         wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
-         wanderingTraderTemptRange = getDouble("mobs.wandering_trader.attributes.tempt_range", wanderingTraderTemptRange);
-+        wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
-     }
- 
-     public boolean wardenRidable = false;