100/310

2026-02-19 09:27:43 +01:00 · 2023-06-08 17:58:43 -04:00
parent e698cb4f08
commit 3f2e212cda
69 changed files with 696 additions and 794 deletions
--- a/patches/todo/server/0033-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/todo/server/0033-Add-option-to-set-armorstand-step-height.patch
@@ -1,47 +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 9f26371ca53dba729a696626c35ef06043dfb995..de4e0d9ca36aa1b75005ad3dcd9b9910b89fc5f1 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -320,7 +320,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public double xOld;
-     public double yOld;
-     public double zOld;
-    private float maxUpStep;
-+    public float maxUpStep; // Purpur - private -> public
-     public boolean noPhysics;
-     protected final RandomSource random;
-     public int tickCount;
-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 3677dd991ae73428984e62e4d6fb757317987887..697d6d6cca0a1c8df9c5bf6852495130a0c57eb4 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -685,6 +685,7 @@ public class ArmorStand extends LivingEntity {
- 
-     @Override
-     public void tick() {
-+        maxUpStep = level.purpurConfig.armorstandStepHeight;
-         // Paper start
-         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 cefd5086a7fef31a88ed4781b6d0bdbd014d36c6..09fd86fd7b5a73c65301a7d23e559acf468fd3de 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -92,6 +92,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/todo/server/0034-Cat-spawning-options.patch
+++ b/patches/todo/server/0034-Cat-spawning-options.patch
@@ -1,76 +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 5f407535298a31a34cfe114dd863fd6a9b977707..29c7e33fe961020e5a0007287fe9b6631689f1b8 100644
--- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-@@ -30,7 +30,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;
-@@ -63,11 +63,15 @@ public class CatSpawner implements CustomSpawner {
-     }
- 
-     private int spawnInVillage(ServerLevel world, BlockPos pos) {
-        int i = 48;
-+        // Purpur start
-+        int range = world.purpurConfig.catSpawnVillageScanRange;
-+        if (range <= 0) return 0;
-+
-         if (world.getPoiManager().getCountInRange((entry) -> {
-             return entry.is(PoiTypes.HOME);
-        }, pos, 48, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
-            List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(48.0D, 8.0D, 48.0D));
-+        }, pos, range, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
-+            List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(range, 8.0D, range));
-+            // Purpur end
-             if (list.size() < 5) {
-                 return this.spawnCat(pos, world);
-             }
-@@ -77,8 +81,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.0D, 8.0D, 16.0D));
-+        // 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.0D, 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 09fd86fd7b5a73c65301a7d23e559acf468fd3de..21fec77f9cbbac41b92450cf7fd4ffc53efc27c3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -269,6 +269,9 @@ public class PurpurWorldConfig {
-     public boolean catRidableInWater = true;
-     public boolean catControllable = true;
-     public double catMaxHealth = 10.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);
-@@ -279,6 +282,9 @@ public class PurpurWorldConfig {
-             set("mobs.cat.attributes.max_health", oldValue);
-         }
-         catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);
-+        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/todo/server/0035-Cows-eat-mushrooms.patch
+++ b/patches/todo/server/0035-Cows-eat-mushrooms.patch
@@ -1,135 +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 e24173dcd6f083a3ae61edcf71bb7236d644a422..b7a0ee0e055d12e36b411859211367c9df3b9549 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -2,6 +2,7 @@ package net.minecraft.world.entity.animal;
- 
- import javax.annotation.Nullable;
- import net.minecraft.core.BlockPos;
-+import net.minecraft.core.particles.ParticleTypes;
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.sounds.SoundEvent;
- import net.minecraft.sounds.SoundEvents;
-@@ -29,6 +30,7 @@ import net.minecraft.world.item.ItemUtils;
- import net.minecraft.world.item.Items;
- import net.minecraft.world.item.crafting.Ingredient;
- import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.block.Blocks;
- import net.minecraft.world.level.block.state.BlockState;
- // CraftBukkit start
- import org.bukkit.craftbukkit.event.CraftEventFactory;
-@@ -69,6 +71,7 @@ public class Cow extends Animal {
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
-         this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-+        if (level.purpurConfig.cowFeedMushrooms > 0) this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT, Blocks.RED_MUSHROOM.asItem(), Blocks.BROWN_MUSHROOM.asItem()), false)); else // Purpur
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT), false));
-         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D));
-         this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-@@ -124,6 +127,10 @@ public class Cow extends Animal {
- 
-             player.setItemInHand(hand, itemstack1);
-             return InteractionResult.sidedSuccess(this.level.isClientSide);
-+        // 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);
-         }
-@@ -139,4 +146,69 @@ public class Cow extends Animal {
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return this.isBaby() ? dimensions.height * 0.95F : 1.3F;
-     }
-+
-+    // Purpur start - feed mushroom to change to mooshroom
-+    private int redMushroomsFed = 0;
-+    private int brownMushroomsFed = 0;
-+
-+    private boolean isMushroom(ItemStack stack) {
-+        return stack.getItem() == Blocks.RED_MUSHROOM.asItem() || stack.getItem() == Blocks.BROWN_MUSHROOM.asItem();
-+    }
-+
-+    private int incrementFeedCount(ItemStack stack) {
-+        if (stack.getItem() == 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);
-+        if (mooshroom == null) {
-+            return InteractionResult.PASS;
-+        }
-+        if (stack.getItem() == Blocks.BROWN_MUSHROOM.asItem()) {
-+            mooshroom.setVariant(MushroomCow.MushroomType.BROWN);
-+        } else {
-+            mooshroom.setVariant(MushroomCow.MushroomType.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;
-+        }
-+        if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), mooshroom.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.INFECTED).callEvent()) {
-+            return InteractionResult.PASS;
-+        }
-+        this.level.addFreshEntity(mooshroom);
-+        this.remove(RemovalReason.DISCARDED);
-+        if (!player.getAbilities().instabuild) {
-+            stack.shrink(1);
-+        }
-+        for (int i = 0; i < 15; ++i) {
-+            ((ServerLevel) level).sendParticles(((ServerLevel) level).players(), null, 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 21fec77f9cbbac41b92450cf7fd4ffc53efc27c3..068e387bdda6d7fe44fafd54aaee66eb44ff4380 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -339,6 +339,7 @@ public class PurpurWorldConfig {
-     public boolean cowRidableInWater = true;
-     public boolean cowControllable = true;
-     public double cowMaxHealth = 10.0D;
-+    public int cowFeedMushrooms = 0;
-     private void cowSettings() {
-         cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
-         cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
-@@ -349,6 +350,7 @@ public class PurpurWorldConfig {
-             set("mobs.cow.attributes.max_health", oldValue);
-         }
-         cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
-+        cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
-     }
- 
-     public boolean creeperRidable = false;
--- a/patches/todo/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/todo/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 b1c2663a7f42714a620d59096f26f0a965875846..12b715086a347b82726327358ac71c72a4fca8b0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -202,7 +202,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-                 // this.discard(); // CraftBukkit - moved down
-                 entitycow.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
-                 entitycow.setHealth(this.getHealth());
-+                // Purpur start
-+                entitycow.copyPosition(this);
-                 entitycow.yBodyRot = this.yBodyRot;
-+                entitycow.setYHeadRot(this.getYHeadRot());
-+                entitycow.yRotO = this.yRotO;
-+                entitycow.xRotO = this.xRotO;
-+                // Purpur end
-                 if (this.hasCustomName()) {
-                     entitycow.setCustomName(this.getCustomName());
-                     entitycow.setCustomNameVisible(this.isCustomNameVisible());
--- a/patches/todo/server/0037-Pigs-give-saddle-back.patch
+++ b/patches/todo/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 17cd8463fa5b601946782174f0a0a77a93aacf4d..8734738ce69e2e776b80a4695fce3bcf33213959 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -174,6 +174,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 068e387bdda6d7fe44fafd54aaee66eb44ff4380..7b1387f46691bad7d092fb82e3311c309e0be76b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -908,6 +908,7 @@ public class PurpurWorldConfig {
-     public boolean pigRidableInWater = false;
-     public boolean pigControllable = true;
-     public double pigMaxHealth = 10.0D;
-+    public boolean pigGiveSaddleBack = false;
-     private void pigSettings() {
-         pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
-         pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
-@@ -918,6 +919,7 @@ public class PurpurWorldConfig {
-             set("mobs.pig.attributes.max_health", oldValue);
-         }
-         pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
-+        pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
-     }
- 
-     public boolean piglinRidable = false;
--- a/patches/todo/server/0038-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/todo/server/0038-Snowman-drop-and-put-back-pumpkin.patch
@@ -1,55 +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 7da9fcf10e6480a71d7a3e9934bb91320cac227e..6c6e020522261ca5bbc47a59c25d3e98bf0b4007 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -191,6 +191,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-             }
- 
-             return InteractionResult.sidedSuccess(this.level.isClientSide);
-+            // 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
-         }
-@@ -202,6 +210,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-         if (!this.level.isClientSide()) {
-             this.setPumpkin(false);
-             this.forceDrops = true; // CraftBukkit
-+            if (level.purpurConfig.snowGolemDropsPumpkin) // Purpur
-             this.spawnAtLocation(new ItemStack(Items.CARVED_PUMPKIN), 1.7F);
-             this.forceDrops = false; // CraftBukkit
-         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7b1387f46691bad7d092fb82e3311c309e0be76b..6c227e9bebd4b6f44ad7da552686468180709f92 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1171,6 +1171,8 @@ public class PurpurWorldConfig {
-     public boolean snowGolemControllable = true;
-     public boolean snowGolemLeaveTrailWhenRidden = false;
-     public double snowGolemMaxHealth = 4.0D;
-+    public boolean snowGolemDropsPumpkin = true;
-+    public boolean snowGolemPutPumpkinBack = false;
-     private void snowGolemSettings() {
-         snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
-         snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1182,6 +1184,8 @@ public class PurpurWorldConfig {
-             set("mobs.snow_golem.attributes.max_health", oldValue);
-         }
-         snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
-+        snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
-+        snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
-     }
- 
-     public boolean snifferRidable = false;
--- a/patches/todo/server/0039-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/todo/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 a23458734a192425ddbec9b114d8485d8e7a2bd3..178c01444b7894833265c21a50ff6805d1aa356a 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
-@@ -714,7 +714,7 @@ public class EnderDragon extends Mob implements Enemy {
-         boolean flag = this.level.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 6c227e9bebd4b6f44ad7da552686468180709f92..61afa4ef024e6bb9b48029aeb42977d977a41620 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -452,6 +452,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);
-@@ -467,6 +468,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/todo/server/0040-Signs-editable-on-right-click.patch
+++ b/patches/todo/server/0040-Signs-editable-on-right-click.patch
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 24 May 2019 02:39:25 -0500
-Subject: [PATCH] Signs editable on right click
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/SignBlock.java b/src/main/java/net/minecraft/world/level/block/SignBlock.java
-index aface9a9697095a29edaf73c9cdabc2c1414b9d7..1a04d0a601b8e481dd6e2592b849b907a5b9f63f 100644
--- a/src/main/java/net/minecraft/world/level/block/SignBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SignBlock.java
-@@ -14,6 +14,7 @@ import net.minecraft.world.item.DyeItem;
- import net.minecraft.world.item.Item;
- import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.item.Items;
-+import net.minecraft.world.item.SignItem;
- import net.minecraft.world.level.BlockGetter;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.level.LevelAccessor;
-@@ -76,11 +77,11 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
-         if (world.isClientSide) {
-             return bl4 ? InteractionResult.SUCCESS : InteractionResult.CONSUME;
-         } else {
-            BlockEntity bl5 = world.getBlockEntity(pos);
-            if (!(bl5 instanceof SignBlockEntity)) {
-+            BlockEntity blockEntity = world.getBlockEntity(pos); // Purpur - decompile fix
-+            if (!(blockEntity instanceof SignBlockEntity)) { // Purpur - decompile fix
-                 return InteractionResult.PASS;
-             } else {
-                SignBlockEntity signBlockEntity = (SignBlockEntity)bl5;
-+                SignBlockEntity signBlockEntity = (SignBlockEntity)blockEntity; // Purpur - decompile fix
-                 boolean bl5 = signBlockEntity.hasGlowingText();
-                 if ((!bl2 || !bl5) && (!bl3 || bl5)) {
-                     if (bl4) {
-@@ -108,6 +109,17 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
-                         }
-                     }
- 
-+                    // Purpur start - right click to open sign editor
-+                    if (world.purpurConfig.signRightClickEdit && itemStack.getItem() instanceof SignItem &&
-+                        !player.isCrouching() && player.getAbilities().mayBuild &&
-+                        player.getBukkitEntity().hasPermission("purpur.sign.edit")) {
-+                        signBlockEntity.setEditable(true);
-+                        signBlockEntity.setAllowedPlayerEditor(player.getUUID());
-+                        player.openTextEdit(signBlockEntity);
-+                        return InteractionResult.SUCCESS;
-+                    }
-+                    // Purpur end
-+
-                     return signBlockEntity.executeClickCommands((ServerPlayer)player) ? InteractionResult.SUCCESS : InteractionResult.PASS;
-                 } else {
-                     return InteractionResult.PASS;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 61afa4ef024e6bb9b48029aeb42977d977a41620..485925e025c5b374b9bbd183a007380eed0c663e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -151,6 +151,11 @@ public class PurpurWorldConfig {
-         });
-     }
- 
-+    public boolean signRightClickEdit = false;
-+    private void signSettings() {
-+        signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
-+    }
-+
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
--- a/patches/todo/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/todo/server/0041-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 34d744837e599633a3c2c0b72f253bb0e157f226..fce9ebcaaac18ecee24c7091ea77a32ac567762e 100644
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -163,7 +163,7 @@ public class FarmBlock extends Block {
-             }
-         }
- 
-        return false;
-+        return ((ServerLevel) world).purpurConfig.farmlandGetsMoistFromBelow && world.getFluidState(pos.relative(Direction.DOWN)).is(FluidTags.WATER); // Purpur;
-     }
- 
-     @Override
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 485925e025c5b374b9bbd183a007380eed0c663e..028581cd6f36f267c81e5c8d09aa6be0172c8691 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -151,6 +151,11 @@ public class PurpurWorldConfig {
-         });
-     }
- 
-+    public boolean farmlandGetsMoistFromBelow = false;
-+    private void farmlandSettings() {
-+        farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
-+    }
-+
-     public boolean signRightClickEdit = false;
-     private void signSettings() {
-         signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
--- a/patches/todo/server/0042-Minecart-settings-and-WASD-controls.patch
+++ b/patches/todo/server/0042-Minecart-settings-and-WASD-controls.patch
@@ -1,223 +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 c3ce105219940d234320a415bd3050087db4778c..1224e5f2b34d32ffeb92300a1763dd6f52b3d1ce 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1071,6 +1071,7 @@ public class ServerPlayer extends Player {
-         if (this.isInvulnerableTo(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 && isSpawnInvulnerable() && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { // Purpur
-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 ee4f924afe15c9a4d96af7a55b357076c7b28501..f774c27dd52219cd524b63cbaa1b23ad55ef849b 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -107,11 +107,13 @@ public abstract class AbstractMinecart extends Entity {
-     private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
-     private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
-     public double maxSpeed = 0.4D;
-+    public double storedMaxSpeed; // Purpur
-     // CraftBukkit end
- 
-     protected AbstractMinecart(EntityType<?> type, Level world) {
-         super(type, world);
-         this.blocksBuilding = true;
-+        if (world != null) maxSpeed = storedMaxSpeed = world.purpurConfig.minecartMaxSpeed; // Purpur
-     }
- 
-     protected AbstractMinecart(EntityType<?> type, Level world, double x, double y, double z) {
-@@ -334,6 +336,12 @@ public abstract class AbstractMinecart extends Entity {
- 
-     @Override
-     public void tick() {
-+        // Purpur start
-+        if (storedMaxSpeed != level.purpurConfig.minecartMaxSpeed) {
-+            maxSpeed = storedMaxSpeed = level.purpurConfig.minecartMaxSpeed;
-+        }
-+        // Purpur end
-+
-         // CraftBukkit start
-         double prevX = this.getX();
-         double prevY = this.getY();
-@@ -497,16 +505,63 @@ public abstract class AbstractMinecart extends Entity {
- 
-     public void activateMinecart(int x, int y, int z, boolean powered) {}
- 
-+    // Purpur start
-+    private Double lastSpeed;
-+
-+    public double getControllableSpeed() {
-+        BlockPos pos = new BlockPos(this);
-+        Block block = level.getBlockState(pos).getBlock();
-+        if (!block.material.isSolid()) {
-+            block = level.getBlockState(pos.relative(Direction.DOWN)).getBlock();
-+        }
-+        Double speed = level.purpurConfig.minecartControllableBlockSpeeds.get(block);
-+        if (!block.material.isSolid()) {
-+            speed = lastSpeed;
-+        }
-+        if (speed == null) {
-+            speed = level.purpurConfig.minecartControllableBaseSpeed;
-+        }
-+        return lastSpeed = speed;
-+    }
-+    // Purpur end
-+
-     protected void comeOffTrack() {
-         double d0 = this.getMaxSpeed();
-         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 c6d2f764efa9b8bec730bbe757d480e365b25ccc..33a30d26da2401535f0a72acb2bbffec1aef151e 100644
--- a/src/main/java/net/minecraft/world/item/MinecartItem.java
-+++ b/src/main/java/net/minecraft/world/item/MinecartItem.java
-@@ -120,8 +120,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;
-+            if (iblockdata.getMaterial().isSolid()) blockposition = blockposition.relative(context.getClickedFace());
-+        } // else { // Purpur - place minecarts anywhere
-             ItemStack itemstack = context.getItemInHand();
- 
-             if (!world.isClientSide) {
-@@ -149,6 +150,6 @@ public class MinecartItem extends Item {
- 
-             itemstack.shrink(1);
-             return InteractionResult.sidedSuccess(world.isClientSide);
-        }
-+        // } // 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 505503a3f59d4b747649275c6f6faa504b7c7b64..532a9920bccfc90ee75ac21714812e88d47b9ebb 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
-@@ -78,7 +78,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
- public abstract class BlockBehaviour implements FeatureElement {
- 
-     protected static final Direction[] UPDATE_SHAPE_ORDER = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP};
-    protected final Material material;
-+    public final Material material; // Purpur - protected -> public
-     public final boolean hasCollision;
-     protected final float explosionResistance;
-     protected final boolean isRandomlyTicking;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 028581cd6f36f267c81e5c8d09aa6be0172c8691..49d8e35b254e0df25963f7247326625928ed89e1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -97,6 +97,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.get(new ResourceLocation(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/todo/server/0043-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/todo/server/0043-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 ad1591644a429b33c042e84a0114fe36bbcc6ec4..161d52ff7b303f5f1eb5f094a63ed63e06d11d08 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1756,6 +1756,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-         this.dropEquipment(); // CraftBukkit - from below
-         if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
-+            if (!(source.is(net.minecraft.world.damagesource.DamageTypes.CRAMMING) && level.purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
-             this.dropFromLootTable(source, flag);
-             // Paper start
-             final boolean prev = this.clearEquipmentSlots;
-@@ -1764,6 +1765,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             // Paper end
-             this.dropCustomDeathLoot(source, i, 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, this.drops, () -> {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 49d8e35b254e0df25963f7247326625928ed89e1..2495ef7023aabb704d47e6b35c100d24828f0208 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -97,6 +97,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/todo/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/todo/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
@@ -1,44 +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/MilkBucketItem.java b/src/main/java/net/minecraft/world/item/MilkBucketItem.java
-index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af74fe2473 100644
--- a/src/main/java/net/minecraft/world/item/MilkBucketItem.java
-+++ b/src/main/java/net/minecraft/world/item/MilkBucketItem.java
-@@ -5,6 +5,8 @@ import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.stats.Stats;
- import net.minecraft.world.InteractionHand;
- import net.minecraft.world.InteractionResultHolder;
-+import net.minecraft.world.effect.MobEffectInstance;
-+import net.minecraft.world.effect.MobEffects;
- import net.minecraft.world.entity.LivingEntity;
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.level.Level;
-@@ -31,7 +33,9 @@ public class MilkBucketItem extends Item {
-         }
- 
-         if (!world.isClientSide) {
-+            MobEffectInstance badOmen = user.getEffect(MobEffects.BAD_OMEN);
-             user.removeAllEffects(org.bukkit.event.entity.EntityPotionEffectEvent.Cause.MILK); // CraftBukkit
-+            if (!world.purpurConfig.milkCuresBadOmen && badOmen != null) user.addEffect(badOmen); // Purpur
-         }
- 
-         return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2495ef7023aabb704d47e6b35c100d24828f0208..ac1cc7a535f76d84877c7f4cb047ddb41c089845 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -98,8 +98,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/todo/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/todo/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 21 Mar 2020 18:33:05 -0500
-Subject: [PATCH] End gateway should check if entity can use portal
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index c73024cc62490c336ffe26313580e88d25ca7078..690d498a97b943a62e8ea415450ca44a2349fee0 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -178,6 +178,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
- 
-     public static void teleportEntity(Level world, BlockPos pos, BlockState state, Entity entity, TheEndGatewayBlockEntity blockEntity) {
-         if (world instanceof ServerLevel && !blockEntity.isCoolingDown()) {
-+            if (!entity.canChangeDimensions()) return; // Purpur
-             ServerLevel worldserver = (ServerLevel) world;
- 
-             blockEntity.teleportCooldown = 100;
--- a/patches/todo/server/0046-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/todo/server/0046-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 87cc7562e4a166d078fe11b7f6980497fc0bd33e..34d1fad0ad4adfcb0372ab16ecd7af0b92b5bedc 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -454,6 +454,7 @@ public class Commands {
-     private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
-         // Paper end - Async command map building
-         new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
-+        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);
- 
-@@ -464,6 +465,7 @@ public class Commands {
-             }
-         }
-         // CraftBukkit end
-+        } // Purpur - skip event
-         player.connection.send(new ClientboundCommandsPacket(rootcommandnode));
-     }
- 
--- a/patches/todo/server/0047-Add-permission-for-F3-N-debug.patch
+++ b/patches/todo/server/0047-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 1d92befb9b9dfb5877065beeb216bdf1caefb770..68905d5121eb05b825602d2bf24612283481c205 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1148,6 +1148,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/todo/server/0048-Configurable-TPS-Catchup.patch
+++ b/patches/todo/server/0048-Configurable-TPS-Catchup.patch
@@ -1,39 +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 6cdcd4f105b15f10d60499572f6f4f830565513e..ceaafede643bac0b6714df3d5475b4cb03b2eaed 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1178,7 +1178,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 this.tickServer(this::haveTime);
-                 this.profiler.popPush("nextTickWait");
-                 this.mayHaveDelayedTasks = true;
-                this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
-+                    // Purpur start - tps catchup
-+                    if (org.purpurmc.purpur.PurpurConfig.tpsCatchup) {
-+                        this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
-+                    } else {
-+                        this.delayedTasksMaxNextTickTime = this.nextTickTime = curTime / 1000000L + 50L;
-+                    }
-+                    // Purpur end - tps catchup
-                 this.waitUntilNextTick();
-                 this.profiler.pop();
-                 this.endMetricsRecordingTick();
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 9db231480f0763c2b6514a956ec9398b98b7d1bc..4905358e2a1939bfba963bda3fcf914721dfac45 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -248,4 +248,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/todo/server/0049-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/todo/server/0049-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 db151bf624095014c99d78b4f6748d2c3792abea..fb10fc5a5aa3b6d6220694041778bfd39ffa1cb8 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-@@ -60,7 +60,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()) {
-                 if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
-                     this.spawnAtLocation(this.getPickupItem(), 0.1F);
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ac1cc7a535f76d84877c7f4cb047ddb41c089845..acc6334ecb3523fa9bf76c53b823a6d848ba88a7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -99,9 +99,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/todo/server/0050-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/todo/server/0050-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 76d796600411144b73d1e7e67f70bb032055d02a..b25d3e25a6be150739aeed99b81e99e3c995dbae 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -361,7 +361,7 @@ public class Creeper extends Monster implements PowerableMob {
-             this.level.getCraftServer().getPluginManager().callEvent(event);
-             if (!event.isCancelled()) {
-                 this.dead = true;
-                this.level.explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB);
-+                this.level.explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), this.level.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING) && level.purpurConfig.creeperAllowGriefing ? Level.ExplosionInteraction.MOB : Level.ExplosionInteraction.NONE); // Purpur
-                 this.discard();
-                 this.spawnLingeringCloud();
-             } else {
-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 79a5d800434b648c77f25e0d1be8e14b94c30f68..b24d890fb9a85434d612c57b4a8763652565d017 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -536,6 +536,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 : (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0);
-         }
- 
-@@ -583,6 +584,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 : (!this.enderman.level.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 acc6334ecb3523fa9bf76c53b823a6d848ba88a7..39d293b0007e13a12bc20f6e958038b328285c03 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -439,6 +439,7 @@ public class PurpurWorldConfig {
-     public boolean creeperControllable = true;
-     public double creeperMaxHealth = 20.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);
-@@ -450,6 +451,7 @@ public class PurpurWorldConfig {
-         }
-         creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
-         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
-+        creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
-     }
- 
-     public boolean dolphinRidable = false;
-@@ -556,6 +558,7 @@ public class PurpurWorldConfig {
-     public boolean endermanRidableInWater = true;
-     public boolean endermanControllable = true;
-     public double endermanMaxHealth = 40.0D;
-+    public boolean endermanAllowGriefing = true;
-     private void endermanSettings() {
-         endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
-         endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -566,6 +569,7 @@ public class PurpurWorldConfig {
-             set("mobs.enderman.attributes.max_health", oldValue);
-         }
-         endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
-+        endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
-     }
- 
-     public boolean endermiteRidable = false;
--- a/patches/todo/server/0051-Villagers-follow-emerald-blocks.patch
+++ b/patches/todo/server/0051-Villagers-follow-emerald-blocks.patch
@@ -1,91 +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/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
-index 79bb13c5614bab1f0749c5f8f57f762c6216c564..2cbc9adc8e417def48be03d08174a5833068ec65 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
-@@ -62,7 +62,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 ca96b893e22de3ae7c11d5cded51edf70bdcb6f2..d4ab27de59e9c533789f062e74ceb453483e2e39 100644
--- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-@@ -43,6 +43,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
-     private CraftMerchant craftMerchant;
-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 fc25e9deb12162f2fe9067da819ff6946f4a5be4..db3d9c95cc3d8212ee0893e0585099ef44da00a2 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -174,6 +174,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));
-     }
- 
-     @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 71212ecb84bdbf838b4a5fbefbe9cfa6343542c4..8bbf7dc66fb225d20fc68d858ce5ed339482b1ef 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -111,6 +111,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 39d293b0007e13a12bc20f6e958038b328285c03..10045705f2a8c9af4df59fff7125c5a137bbf14d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1437,6 +1437,7 @@ public class PurpurWorldConfig {
-     public boolean villagerRidableInWater = true;
-     public boolean villagerControllable = true;
-     public double villagerMaxHealth = 20.0D;
-+    public boolean villagerFollowEmeraldBlock = false;
-     private void villagerSettings() {
-         villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
-         villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
-             set("mobs.villager.attributes.max_health", oldValue);
-         }
-         villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
-+        villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
-     }
- 
-     public boolean vindicatorRidable = false;
-@@ -1469,6 +1471,7 @@ public class PurpurWorldConfig {
-     public boolean wanderingTraderRidableInWater = true;
-     public boolean wanderingTraderControllable = true;
-     public double wanderingTraderMaxHealth = 20.0D;
-+    public boolean wanderingTraderFollowEmeraldBlock = false;
-     private void wanderingTraderSettings() {
-         wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
-         wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1479,6 +1482,7 @@ public class PurpurWorldConfig {
-             set("mobs.wandering_trader.attributes.max_health", oldValue);
-         }
-         wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
-+        wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
-     }
- 
-     public boolean wardenRidable = false;
--- a/patches/todo/server/0052-Allow-leashing-villagers.patch
+++ b/patches/todo/server/0052-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/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index f6ec6a249b4559e681382c9690ddc7b9e17c9efb..7fda4e04a3e0ca8a09dccd1af36b77cca0b78a2b 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1305,6 +1305,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         if (!this.isAlive()) {
-             return InteractionResult.PASS;
-         } else if (this.getLeashHolder() == player) {
-+            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 - drop leash variable
-             org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.getAbilities().instabuild);
-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 db3d9c95cc3d8212ee0893e0585099ef44da00a2..979bbbf4229a9355b31913454cb565fc98049911 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -181,6 +181,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-     public void initAttributes() {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.villagerMaxHealth);
-     }
-+
-+    @Override
-+    public boolean canBeLeashed(Player player) {
-+        return level.purpurConfig.villagerCanBeLeashed && !this.isLeashed();
-+    }
-     // 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 8bbf7dc66fb225d20fc68d858ce5ed339482b1ef..559bad9524a00a5357973f30d54b0f1a3ed6dadb 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -89,6 +89,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-     public void initAttributes() {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.wanderingTraderMaxHealth);
-     }
-+
-+    @Override
-+    public boolean canBeLeashed(Player player) {
-+        return level.purpurConfig.wanderingTraderCanBeLeashed && !this.isLeashed();
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 10045705f2a8c9af4df59fff7125c5a137bbf14d..422d784c62423933b78a624292d4bf9fa78358f1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1438,6 +1438,7 @@ public class PurpurWorldConfig {
-     public boolean villagerControllable = true;
-     public double villagerMaxHealth = 20.0D;
-     public boolean villagerFollowEmeraldBlock = false;
-+    public boolean villagerCanBeLeashed = false;
-     private void villagerSettings() {
-         villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
-         villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1449,6 +1450,7 @@ public class PurpurWorldConfig {
-         }
-         villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
-         villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
-+        villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
-     }
- 
-     public boolean vindicatorRidable = false;
-@@ -1472,6 +1474,7 @@ public class PurpurWorldConfig {
-     public boolean wanderingTraderControllable = true;
-     public double wanderingTraderMaxHealth = 20.0D;
-     public boolean wanderingTraderFollowEmeraldBlock = false;
-+    public boolean wanderingTraderCanBeLeashed = false;
-     private void wanderingTraderSettings() {
-         wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
-         wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1483,6 +1486,7 @@ public class PurpurWorldConfig {
-         }
-         wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
-         wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
-+        wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
-     }
- 
-     public boolean wardenRidable = false;
--- a/patches/todo/server/0053-Implement-infinite-liquids.patch
+++ b/patches/todo/server/0053-Implement-infinite-liquids.patch
@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 23 Nov 2019 17:55:42 -0600
-Subject: [PATCH] Implement infinite liquids
-
-
-diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-index 6063665b8848a2cd9f0b262eed36a9dd48db6035..5536b9e36b4ea99e2aaa62690b5bf00208291a58 100644
--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-@@ -226,7 +226,7 @@ public abstract class FlowingFluid extends Fluid {
-             }
-         }
- 
-        if (this.canConvertToSource(world) && j >= 2) {
-+        if (this.canConvertToSource(world) && j >= getRequiredSources(world)) {
-             BlockState iblockdata2 = world.getBlockState(pos.below());
-             FluidState fluid1 = iblockdata2.getFluidState();
- 
-@@ -324,6 +324,12 @@ public abstract class FlowingFluid extends Fluid {
- 
-     protected abstract boolean canConvertToSource(Level world);
- 
-+    // Purpur start
-+    protected int getRequiredSources(Level level) {
-+        return 2;
-+    }
-+    // Purpur end
-+
-     protected void spreadTo(LevelAccessor world, BlockPos pos, BlockState state, Direction direction, FluidState fluidState) {
-         if (state.getBlock() instanceof LiquidBlockContainer) {
-             ((LiquidBlockContainer) state.getBlock()).placeLiquid(world, pos, state, fluidState);
-diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-index 783e315d92227cbcb5cd207b0a06a12e0778d14b..e965d2cafdd887a7c61058ba2931596709e5aaa2 100644
--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-@@ -198,6 +198,13 @@ public abstract class LavaFluid extends FlowingFluid {
-         world.levelEvent(1501, pos, 0);
-     }
- 
-+    // Purpur start
-+    @Override
-+    protected int getRequiredSources(Level level) {
-+        return level.purpurConfig.lavaInfiniteRequiredSources;
-+    }
-+    // Purpur end
-+
-     @Override
-     protected boolean canConvertToSource(Level world) {
-         return world.getGameRules().getBoolean(GameRules.RULE_LAVA_SOURCE_CONVERSION);
-diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-index 82e85fbbd45244d02df90fa00c9046e7f51275a2..ec6c63075306f9e5389e83641d2c8a82369ddc6b 100644
--- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-@@ -64,6 +64,13 @@ public abstract class WaterFluid extends FlowingFluid {
-         return world.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
-     }
- 
-+    // Purpur start
-+    @Override
-+    protected int getRequiredSources(Level level) {
-+        return level.purpurConfig.waterInfiniteRequiredSources;
-+    }
-+    // Purpur end
-+
-     // Paper start
-     @Override
-     protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 422d784c62423933b78a624292d4bf9fa78358f1..2db284e2c4a4bd22c964c2ed39a54797b6d22e35 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -227,6 +227,11 @@ public class PurpurWorldConfig {
-         farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
-     }
- 
-+    public int lavaInfiniteRequiredSources = 2;
-+    private void lavaSettings() {
-+        lavaInfiniteRequiredSources = getInt("blocks.lava.infinite-required-sources", lavaInfiniteRequiredSources);
-+    }
-+
-     public boolean signRightClickEdit = false;
-     private void signSettings() {
-         signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
-@@ -241,6 +246,11 @@ public class PurpurWorldConfig {
-         turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
-     }
- 
-+    public int waterInfiniteRequiredSources = 2;
-+    private void waterSources() {
-+        waterInfiniteRequiredSources = getInt("blocks.water.infinite-required-sources", waterInfiniteRequiredSources);
-+    }
-+
-     public boolean babiesAreRidable = true;
-     public boolean untamedTamablesAreRidable = true;
-     public boolean useNightVisionWhenRiding = false;
--- a/patches/todo/server/0054-Make-lava-flow-speed-configurable.patch
+++ b/patches/todo/server/0054-Make-lava-flow-speed-configurable.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 2 Jan 2020 11:31:36 -0600
-Subject: [PATCH] Make lava flow speed configurable
-
-
-diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-index e965d2cafdd887a7c61058ba2931596709e5aaa2..3a04cb4c646c07abf4338c70c865a4c4cb34b1bc 100644
--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-@@ -180,7 +180,7 @@ public abstract class LavaFluid extends FlowingFluid {
- 
-     @Override
-     public int getTickDelay(LevelReader world) {
-        return world.dimensionType().ultraWarm() ? 10 : 30;
-+        return world.dimensionType().ultraWarm() ? world.getWorldBorder().world.purpurConfig.lavaSpeedNether : world.getWorldBorder().world.purpurConfig.lavaSpeedNotNether; // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2db284e2c4a4bd22c964c2ed39a54797b6d22e35..3f3bb568d6991c00335f0c48a7d28663c3031aba 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -228,8 +228,12 @@ public class PurpurWorldConfig {
-     }
- 
-     public int lavaInfiniteRequiredSources = 2;
-+    public int lavaSpeedNether = 10;
-+    public int lavaSpeedNotNether = 30;
-     private void lavaSettings() {
-         lavaInfiniteRequiredSources = getInt("blocks.lava.infinite-required-sources", lavaInfiniteRequiredSources);
-+        lavaSpeedNether = getInt("blocks.lava.speed.nether", lavaSpeedNether);
-+        lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
-     }
- 
-     public boolean signRightClickEdit = false;
--- a/patches/todo/server/0055-Add-player-death-exp-control-options.patch
+++ b/patches/todo/server/0055-Add-player-death-exp-control-options.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 26 Dec 2019 22:08:37 -0600
-Subject: [PATCH] Add player death exp control options
-
-
-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 05106a3bd2284d1ab25067241248238bb69d4610..cd5d9b5e6853cebb556c347ebdcb0ec912a61f87 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1971,9 +1971,19 @@ public abstract class Player extends LivingEntity {
-     @Override
-     public int getExperienceReward() {
-         if (!this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {
-            int i = this.experienceLevel * 7;
-
-            return i > 100 ? 100 : i;
-+            // Purpur start
-+            int toDrop;
-+            try {
-+                toDrop = Math.round(((Number) scriptEngine.eval("let expLevel = " + experienceLevel + "; " +
-+                        "let expTotal = " + totalExperience + "; " +
-+                        "let exp = " + experienceProgress + "; " +
-+                        level.purpurConfig.playerDeathExpDropEquation)).floatValue());
-+            } catch (javax.script.ScriptException e) {
-+                e.printStackTrace();
-+                toDrop = experienceLevel * 7;
-+            }
-+            return Math.min(toDrop, level.purpurConfig.playerDeathExpDropMax);
-+            // Purpur end
-         } else {
-             return 0;
-         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3f3bb568d6991c00335f0c48a7d28663c3031aba..0cd282a9c4ace413c6fe66c3bafc2137573f529f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -175,6 +175,8 @@ public class PurpurWorldConfig {
-     public boolean idleTimeoutTargetPlayer = true;
-     public int playerSpawnInvulnerableTicks = 60;
-     public boolean playerInvulnerableWhileAcceptingResourcePack = false;
-+    public String playerDeathExpDropEquation = "expLevel * 7";
-+    public int playerDeathExpDropMax = 100;
-     private void playerSettings() {
-         if (PurpurConfig.version < 19) {
-             boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -188,6 +190,8 @@ public class PurpurWorldConfig {
-         idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
-         playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
-         playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
-+        playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
-+        playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
-     }
- 
-     public boolean silkTouchEnabled = false;
--- a/patches/todo/server/0056-Configurable-void-damage-height-and-damage.patch
+++ b/patches/todo/server/0056-Configurable-void-damage-height-and-damage.patch
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 27 Feb 2020 21:42:19 -0600
-Subject: [PATCH] Configurable void damage height and damage
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 40d71ea65892910e5e9382591248aa337e9ab07c..7d6040eebf4789c136f10a28ee6a2fe687973986 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -895,7 +895,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     public void checkOutOfWorld() {
-         // Paper start - Configurable nether ceiling damage
-        if (this.getY() < (double) (this.level.getMinBuildHeight() - 64) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
-+        if (this.getY() < (double) (this.level.getMinBuildHeight() + level.purpurConfig.voidDamageHeight) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER // Purpur
-             && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
-             && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
-             // Paper end
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 161d52ff7b303f5f1eb5f094a63ed63e06d11d08..f55f39536356224438b52b2201ec7f66680865c8 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2462,7 +2462,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-     @Override
-     protected void outOfWorld() {
-        this.hurt(this.damageSources().outOfWorld(), 4.0F);
-+        this.hurt(this.damageSources().outOfWorld(), (float) level.purpurConfig.voidDamageDealt); // Purpur
-     }
- 
-     protected void updateSwingTime() {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0cd282a9c4ace413c6fe66c3bafc2137573f529f..3c6025ff4fffdfd5f45011a1b65bf27323031a5c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -100,10 +100,14 @@ public class PurpurWorldConfig {
-     public boolean disableDropsOnCrammingDeath = false;
-     public boolean milkCuresBadOmen = true;
-     public double tridentLoyaltyVoidReturnHeight = 0.0D;
-+    public double voidDamageHeight = -64.0D;
-+    public double voidDamageDealt = 4.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);
-+        voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
-+        voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
-     }
- 
-     public double minecartMaxSpeed = 0.4D;
--- a/patches/todo/server/0057-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/todo/server/0057-Add-canSaveToDisk-to-Entity.patch
@@ -1,80 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 18 Feb 2020 20:07:08 -0600
-Subject: [PATCH] Add canSaveToDisk to Entity
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7d6040eebf4789c136f10a28ee6a2fe687973986..7260fc2adc222a6fc5c64ba9ba01ee91051accb8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4794,5 +4794,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public boolean processClick(InteractionHand hand) {
-         return false;
-     }
-+
-+    public boolean canSaveToDisk() {
-+        return true;
-+    }
-     // Purpur end
- }
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index a6a9628f0e467f2b38dd346d90862f19712b3016..864ebffb6c903acb9de5594029838b927eea4318 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -220,6 +220,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-                 // do not hit rider
-                 return target != rider && super.canHitEntity(target);
-             }
-+
-+            @Override
-+            public boolean canSaveToDisk() {
-+                return false;
-+            }
-         };
-         skull.setPosRaw(headX, headY, headZ);
-         level.addFreshEntity(skull);
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 060e064625969610539dbf969ce773b877a7c579..32cd9df202704cdfb8fa06aaf0e738d483054feb 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -112,6 +112,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
-         ListTag listTag = new ListTag();
-         final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper
-         entities.forEach((entity) -> { // diff here: use entities parameter
-+            if (!entity.canSaveToDisk()) return; // Purpur
-             // Paper start
-             final EntityType<?> entityType = entity.getType();
-             final int saveLimit = level.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
-diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-index 602df34e3ec0d05f58737a54a1e8585e8730095c..f0279d6cdc93f524f321c3c40967fdeeb8d2c46b 100644
--- a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-+++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-@@ -35,6 +35,11 @@ public class DolphinSpit extends LlamaSpit {
-                 dolphin.getZ() + (double) (dolphin.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(dolphin.yBodyRot * 0.017453292F));
-     }
- 
-+    @Override
-+    public boolean canSaveToDisk() {
-+        return false;
-+    }
-+
-     public void tick() {
-         super_tick();
- 
-diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
-index 9ee7fc642d05fd61d91d09c754c6f0680bc39e56..1542f038621b97a298a0fb31ab3be912e2bcd0d6 100644
--- a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
-+++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
-@@ -38,6 +38,11 @@ public class PhantomFlames extends LlamaSpit {
-                 phantom.getZ() + (double) (phantom.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(phantom.yBodyRot * 0.017453292F));
-     }
- 
-+    @Override
-+    public boolean canSaveToDisk() {
-+        return false;
-+    }
-+
-     public void tick() {
-         super_tick();
- 
--- a/patches/todo/server/0058-Dispenser-curse-of-binding-protection.patch
+++ b/patches/todo/server/0058-Dispenser-curse-of-binding-protection.patch
@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 25 Aug 2019 00:09:52 -0500
-Subject: [PATCH] Dispenser curse of binding protection
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7fda4e04a3e0ca8a09dccd1af36b77cca0b78a2b..89981efcb852fed1ca79f8b239aa1f044d713c6d 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -65,6 +65,7 @@ import net.minecraft.world.item.ProjectileWeaponItem;
- import net.minecraft.world.item.SpawnEggItem;
- import net.minecraft.world.item.SwordItem;
- import net.minecraft.world.item.enchantment.EnchantmentHelper;
-+import net.minecraft.world.item.enchantment.Enchantments;
- import net.minecraft.world.level.GameRules;
- import net.minecraft.world.level.ItemLike;
- import net.minecraft.world.level.Level;
-@@ -1163,6 +1164,12 @@ public abstract class Mob extends LivingEntity implements Targeting {
- 
-     }
- 
-+    // Purpur start
-+    public static @Nullable EquipmentSlot getSlotForDispenser(ItemStack itemstack) {
-+        return EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BINDING_CURSE, itemstack) > 0 ? null : getEquipmentSlotForItem(itemstack);
-+    }
-+    // Purpur end
-+
-     @Nullable
-     public static Item getEquipmentForSlot(EquipmentSlot equipmentSlot, int equipmentLevel) {
-         switch (equipmentSlot) {
-diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java
-index d7a0cbde8f8c99276307502674c71463fbe7e89c..3500c56cb85d8c76b2acd77976d374eaf487b3b3 100644
--- a/src/main/java/net/minecraft/world/item/ArmorItem.java
-+++ b/src/main/java/net/minecraft/world/item/ArmorItem.java
-@@ -60,7 +60,7 @@ public class ArmorItem extends Item implements Equipable {
-             return false;
-         } else {
-             LivingEntity entityliving = (LivingEntity) list.get(0);
-            EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(armor);
-+            EquipmentSlot enumitemslot = pointer.getLevel().purpurConfig.dispenserApplyCursedArmor ? Mob.getEquipmentSlotForItem(armor) : Mob.getSlotForDispenser(armor); if (enumitemslot == null) return false; // Purpur
-             ItemStack itemstack1 = armor.copyWithCount(1); // Paper - shrink below and single item in event
-             // CraftBukkit start
-             Level world = pointer.getLevel();
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3c6025ff4fffdfd5f45011a1b65bf27323031a5c..b94467efbde7113bac462a0c698a95643beff41d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -230,6 +230,11 @@ public class PurpurWorldConfig {
-         });
-     }
- 
-+    public boolean dispenserApplyCursedArmor = true;
-+    private void dispenserSettings() {
-+        dispenserApplyCursedArmor = getBoolean("blocks.dispenser.apply-cursed-to-armor-slots", dispenserApplyCursedArmor);
-+    }
-+
-     public boolean farmlandGetsMoistFromBelow = false;
-     private void farmlandSettings() {
-         farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
--- a/patches/todo/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/todo/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 7 Sep 2019 22:47:59 -0500
-Subject: [PATCH] Add option for boats to eject players on land
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 12e3209c5246ede89daaf8455fe70b4a517e12f6..9038d694ea8d56aaed4794f55f7c23b8c1358ba7 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -541,6 +541,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
- 
-             if (f > 0.0F) {
-                 this.landFriction = f;
-+                if (level.purpurConfig.boatEjectPlayersOnLand) ejectPassengers(); // Purpur
-                 return Boat.Status.ON_LAND;
-             } else {
-                 return Boat.Status.IN_AIR;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b94467efbde7113bac462a0c698a95643beff41d..06f0e13063fc8e5438bce551c88b8d3b7b12d6d9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -97,12 +97,14 @@ public class PurpurWorldConfig {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-     }
- 
-+    public boolean boatEjectPlayersOnLand = false;
-     public boolean disableDropsOnCrammingDeath = false;
-     public boolean milkCuresBadOmen = true;
-     public double tridentLoyaltyVoidReturnHeight = 0.0D;
-     public double voidDamageHeight = -64.0D;
-     public double voidDamageDealt = 4.0D;
-     private void miscGameplayMechanicsSettings() {
-+        boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-         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);
--- a/patches/todo/server/0060-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/todo/server/0060-Mending-mends-most-damages-equipment-first.patch
@@ -1,94 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 14 Jul 2019 19:52:47 -0500
-Subject: [PATCH] Mending mends most damages equipment first
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index a9f20e6a73e2e1875abd1e122a5d08c4ef44f9d8..0813151ba9d1dcf1aa40fb4c7f259510adc326da 100644
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -324,7 +324,7 @@ public class ExperienceOrb extends Entity {
-     }
- 
-     private int repairPlayerItems(Player player, int amount) {
-        Entry<EquipmentSlot, ItemStack> entry = EnchantmentHelper.getRandomItemWith(Enchantments.MENDING, player, ItemStack::isDamaged);
-+        Entry<EquipmentSlot, ItemStack> entry = level.purpurConfig.useBetterMending ? EnchantmentHelper.getMostDamagedEquipment(Enchantments.MENDING, player) : EnchantmentHelper.getRandomItemWith(Enchantments.MENDING, player, ItemStack::isDamaged); // Purpur
- 
-         if (entry != null) {
-             ItemStack itemstack = (ItemStack) entry.getValue();
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d81fcbadc5c0b3d4b54dde5d47a0f847d8ec6918..a9fd9aa145a2d06d6d6733c541a0d13e6cadbecb 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -566,6 +566,16 @@ public final class ItemStack {
-         return this.isDamageableItem() && this.getDamageValue() > 0;
-     }
- 
-+    // Purpur start
-+    public float getDamagePercent() {
-+        if (isDamaged()) {
-+            return (float) getDamageValue() / (float) getItem().getMaxDamage();
-+        } else {
-+            return 0F;
-+        }
-+    }
-+    // Purpur end
-+
-     public int getDamageValue() {
-         return this.tag == null ? 0 : this.tag.getInt("Damage");
-     }
-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 ecf640b00007a386290f8dfe9935a8aa610079fd..2048899f8e4c8211e8dde0d11148d647678009fa 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-@@ -278,6 +278,29 @@ public class EnchantmentHelper {
-         return getItemEnchantmentLevel(Enchantments.CHANNELING, stack) > 0;
-     }
- 
-+    // Purpur start
-+    @Nullable
-+    public static Map.Entry<EquipmentSlot, ItemStack> getMostDamagedEquipment(Enchantment enchantment, LivingEntity entity) {
-+        Map<EquipmentSlot, ItemStack> map = enchantment.getSlotItems(entity);
-+        if (map.isEmpty()) {
-+            return null;
-+        }
-+        Map.Entry<EquipmentSlot, ItemStack> item = null;
-+        float maxPercent = 0F;
-+        for (Map.Entry<EquipmentSlot, ItemStack> entry : map.entrySet()) {
-+            ItemStack itemstack = entry.getValue();
-+            if (!itemstack.isEmpty() && itemstack.isDamaged() && getItemEnchantmentLevel(enchantment, itemstack) > 0) {
-+                float percent = itemstack.getDamagePercent();
-+                if (item == null || percent > maxPercent) {
-+                    item = entry;
-+                    maxPercent = percent;
-+                }
-+            }
-+        }
-+        return item;
-+    }
-+    // Purpur end
-+
-     @Nullable
-     public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(Enchantment enchantment, LivingEntity entity) {
-         return getRandomItemWith(enchantment, entity, (stack) -> {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 06f0e13063fc8e5438bce551c88b8d3b7b12d6d9..d1c45c19697408fd97448953bada1de1edc67b1d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -97,6 +97,7 @@ public class PurpurWorldConfig {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-     }
- 
-+    public boolean useBetterMending = false;
-     public boolean boatEjectPlayersOnLand = false;
-     public boolean disableDropsOnCrammingDeath = false;
-     public boolean milkCuresBadOmen = true;
-@@ -104,6 +105,7 @@ public class PurpurWorldConfig {
-     public double voidDamageHeight = -64.0D;
-     public double voidDamageDealt = 4.0D;
-     private void miscGameplayMechanicsSettings() {
-+        useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
-         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-         disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
-         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
--- a/patches/todo/server/0061-Add-5-second-tps-average-in-tps.patch
+++ b/patches/todo/server/0061-Add-5-second-tps-average-in-tps.patch
@@ -1,95 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 28 Jul 2019 01:27:37 -0500
-Subject: [PATCH] Add 5 second tps average in /tps
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf21641a2200c 100644
--- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-+++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-@@ -58,7 +58,7 @@ public class RAMDetails extends JList<String> {
-         GraphData data = RAMGraph.DATA.peekLast();
-         Vector<String> vector = new Vector<>();
- 
-        double[] tps = new double[] {server.tps1.getAverage(), server.tps5.getAverage(), server.tps15.getAverage()};
-+        double[] tps = new double[] {server.tps5s.getAverage(), server.tps1.getAverage(), server.tps5.getAverage(), server.tps15.getAverage()}; // Purpur
-         String[] tpsAvg = new String[tps.length];
- 
-         for ( int g = 0; g < tps.length; g++) {
-@@ -67,7 +67,7 @@ public class RAMDetails extends JList<String> {
-         vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
-         vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
-         vector.add("Avg tick: " + DECIMAL_FORMAT.format(getAverage(server.tickTimes)) + " ms");
-        vector.add("TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg));
-+        vector.add("TPS from last 5s, 1m, 5m, 15m: " + String.join(", ", tpsAvg)); // Purpur
- 
-         setListData(vector);
-     }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ceaafede643bac0b6714df3d5475b4cb03b2eaed..65ba915d3644b638ce3b5314c0aed5b2018f67e0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public static final int TPS = 20;
-     public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
-     private static final int SAMPLE_INTERVAL = 20; // Paper
-    public final double[] recentTps = new double[ 3 ];
-+    public final double[] recentTps = new double[ 4 ]; // Purpur
-     // Spigot end
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
-     public static long currentTickLong = 0L; // Paper
-@@ -1052,6 +1052,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
-     private long lastTick = 0;
-     private long catchupTime = 0;
-+    public final RollingAverage tps5s = new RollingAverage(5); // Purpur
-     public final RollingAverage tps1 = new RollingAverage(60);
-     public final RollingAverage tps5 = new RollingAverage(60 * 5);
-     public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1152,13 +1153,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 {
-                     final long diff = curTime - tickSection;
-                     java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
-+                        tps5s.add(currentTps, diff); // Purpur
-                     tps1.add(currentTps, diff);
-                     tps5.add(currentTps, diff);
-                     tps15.add(currentTps, diff);
-                     // Backwards compat with bad plugins
-                    this.recentTps[0] = tps1.getAverage();
-                    this.recentTps[1] = tps5.getAverage();
-                    this.recentTps[2] = tps15.getAverage();
-+                        // Purpur start
-+                        this.recentTps[0] = tps5s.getAverage();
-+                        this.recentTps[1] = tps1.getAverage();
-+                        this.recentTps[2] = tps5.getAverage();
-+                        this.recentTps[3] = tps15.getAverage();
-+                        // Purpur end
-                     // Paper end
-                         lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
-                     tickSection = curTime;
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 32da3d33dec77608e23a38a60669d08b39bfb892..b2db5a0594a9749005c728c0f9ac32743cf303f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2725,6 +2725,7 @@ public final class CraftServer implements Server {
-     @Override
-     public double[] getTPS() {
-         return new double[] {
-+                net.minecraft.server.MinecraftServer.getServer().tps5s.getAverage(), // Purpur
-                 net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
-                 net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
-                 net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
-diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index bf970bf3356a914459c2d6db93537ce2d32c7e18..08221c7256f41ca511a4a61ffb2b979325aebee9 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-@@ -39,7 +39,7 @@ public class TicksPerSecondCommand extends Command
-         }
- 
-         net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
-        builder.append(net.kyori.adventure.text.Component.text("TPS from last 1m, 5m, 15m: ", net.kyori.adventure.text.format.NamedTextColor.GOLD));
-+        builder.append(net.kyori.adventure.text.Component.text("TPS from last 5s, 1m, 5m, 15m: ", net.kyori.adventure.text.format.NamedTextColor.GOLD));
-         builder.append(net.kyori.adventure.text.Component.join(net.kyori.adventure.text.JoinConfiguration.commas(true), tpsAvg));
-         sender.sendMessage(builder.asComponent());
-         if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
--- a/patches/todo/server/0062-Implement-elytra-settings.patch
+++ b/patches/todo/server/0062-Implement-elytra-settings.patch
@@ -1,124 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 25 Jul 2019 18:07:37 -0500
-Subject: [PATCH] Implement elytra settings
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f55f39536356224438b52b2201ec7f66680865c8..a8ace2c448ddae71e8e64f232c75d541aa531f3f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3477,7 +3477,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                     int j = i / 10;
- 
-                     if (j % 2 == 0) {
-                        itemstack.hurtAndBreak(1, this, (entityliving) -> {
-+                        // Purpur start
-+                        int damage = level.purpurConfig.elytraDamagePerSecond;
-+                        if (level.purpurConfig.elytraDamageMultiplyBySpeed > 0) {
-+                            double speed = getDeltaMovement().lengthSqr();
-+                            if (speed > level.purpurConfig.elytraDamageMultiplyBySpeed) {
-+                                damage *= (int) speed;
-+                            }
-+                        }
-+                        itemstack.hurtAndBreak(damage, this, (entityliving) -> {
-+                        // Purpur end
-                             entityliving.broadcastBreakEvent(EquipmentSlot.CHEST);
-                         });
-                     }
-diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index 82b0bda3e35ec2157a477e1a17b2b46baadc97d9..0fc45b1048a1c4e0dc2bd1ae0437eecbe113cf96 100644
--- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-+++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-@@ -15,6 +15,7 @@ import net.minecraft.util.ByIdMap;
- import net.minecraft.world.InteractionHand;
- import net.minecraft.world.InteractionResult;
- import net.minecraft.world.InteractionResultHolder;
-+import net.minecraft.world.entity.EquipmentSlot;
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.entity.projectile.FireworkRocketEntity;
- import net.minecraft.world.item.context.UseOnContext;
-@@ -69,6 +70,14 @@ public class FireworkRocketItem extends Item {
-                 com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) fireworkRocketEntity.getBukkitEntity());
-                 if (event.callEvent() && world.addFreshEntity(fireworkRocketEntity)) {
-                     user.awardStat(Stats.ITEM_USED.get(this));
-+                    // Purpur start
-+                    if (world.purpurConfig.elytraDamagePerFireworkBoost > 0) {
-+                        ItemStack chestItem = user.getItemBySlot(EquipmentSlot.CHEST);
-+                        if (chestItem.getItem() == Items.ELYTRA) {
-+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerFireworkBoost, user, (entityliving) -> entityliving.broadcastBreakEvent(EquipmentSlot.CHEST));
-+                        }
-+                    }
-+                    // Purpur end
-                     if (event.shouldConsume() && !user.getAbilities().instabuild) {
-                     itemStack.shrink(1);
-                     } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index be0585ce01d851105699e02e6b35e486f0c13a88..6d3d68faba89cf388d52d9a526a3d14ab9e21a22 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -595,7 +595,7 @@ public final class ItemStack {
-             int j;
- 
-             if (amount > 0) {
-                j = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, this);
-+                j = (getItem() == Items.ELYTRA && player != null && player.level.purpurConfig.elytraIgnoreUnbreaking) ? 0 : EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, this);
-                 int k = 0;
- 
-                 for (int l = 0; j > 0 && l < amount; ++l) {
-@@ -650,6 +650,12 @@ public final class ItemStack {
-                 if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent
-                     breakCallback.accept(entity);
-                     Item item = this.getItem();
-+                    // Purpur start
-+                    if (item == Items.ELYTRA) {
-+                        setDamageValue(item.getMaxDamage() - 1);
-+                        return;
-+                    }
-+                    // Purpur end
-                     // CraftBukkit start - Check for item breaking
-                     if (this.count == 1 && entity instanceof net.minecraft.world.entity.player.Player) {
-                         org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((net.minecraft.world.entity.player.Player) entity, this);
-diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 9365f886a23a71c41091b22d46896ff18a5a0635..41bd45c0720751f348b5cf6eaecac4397a439857 100644
--- a/src/main/java/net/minecraft/world/item/TridentItem.java
-+++ b/src/main/java/net/minecraft/world/item/TridentItem.java
-@@ -130,6 +130,14 @@ public class TridentItem extends Item implements Vanishable {
-                         f2 *= f6 / f5;
-                         f3 *= f6 / f5;
-                         f4 *= f6 / f5;
-+
-+                        // Purpur start
-+                        ItemStack chestItem = entityhuman.getItemBySlot(EquipmentSlot.CHEST);
-+                        if (chestItem.getItem() == Items.ELYTRA && world.purpurConfig.elytraDamagePerTridentBoost > 0) {
-+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerTridentBoost, entityhuman, (entity) -> entity.broadcastBreakEvent(EquipmentSlot.CHEST));
-+                        }
-+                        // Purpur end
-+
-                         entityhuman.push((double) f2, (double) f3, (double) f4);
-                         entityhuman.startAutoSpinAttack(20);
-                         if (entityhuman.isOnGround()) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d1c45c19697408fd97448953bada1de1edc67b1d..67ffbf096e4fcd29266eb329451213c72415e439 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -114,6 +114,19 @@ public class PurpurWorldConfig {
-         voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
-     }
- 
-+    public int elytraDamagePerSecond = 1;
-+    public double elytraDamageMultiplyBySpeed = 0;
-+    public boolean elytraIgnoreUnbreaking = false;
-+    public int elytraDamagePerFireworkBoost = 0;
-+    public int elytraDamagePerTridentBoost = 0;
-+    private void elytraSettings() {
-+        elytraDamagePerSecond = getInt("gameplay-mechanics.elytra.damage-per-second", elytraDamagePerSecond);
-+        elytraDamageMultiplyBySpeed = getDouble("gameplay-mechanics.elytra.damage-multiplied-by-speed", elytraDamageMultiplyBySpeed);
-+        elytraIgnoreUnbreaking = getBoolean("gameplay-mechanics.elytra.ignore-unbreaking", elytraIgnoreUnbreaking);
-+        elytraDamagePerFireworkBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.firework", elytraDamagePerFireworkBoost);
-+        elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
-+    }
-+
-     public double minecartMaxSpeed = 0.4D;
-     public boolean minecartPlaceAnywhere = false;
-     public boolean minecartControllable = false;
--- a/patches/todo/server/0063-Item-entity-immunities.patch
+++ b/patches/todo/server/0063-Item-entity-immunities.patch
@@ -1,170 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 22 Feb 2020 15:54:08 -0600
-Subject: [PATCH] Item entity immunities
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index d5cb594f0b17ec9dc1a19cdb99bba553e70171be..6afee2a744a3498d4a0eee35f77cde444f73d12c 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -72,7 +72,7 @@ public class ServerEntity {
-     @Nullable
-     private List<SynchedEntityData.DataValue<?>> trackedDataValues;
-     // CraftBukkit start
-    final Set<ServerPlayerConnection> trackedPlayers; // Paper - private -> package
-+    public final Set<ServerPlayerConnection> trackedPlayers; // Paper - private -> package // Purpur - package -> public
- 
-     public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
-         this.trackedPlayers = trackedPlayers;
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 453f0f7042bdf204db73be139aa36f211c5455e7..52a14af24e3c51c53b40fdb6594b1664eef6d486 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -55,6 +55,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
-     public boolean canMobPickup = true; // Paper
-     private int despawnRate = -1; // Paper
-     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
-+    // Purpur start
-+    public boolean immuneToCactus = false;
-+    public boolean immuneToExplosion = false;
-+    public boolean immuneToFire = false;
-+    public boolean immuneToLightning = false;
-+    // Purpur end
- 
-     public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
-         super(type, world);
-@@ -349,6 +355,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
-             return false;
-         } else if (!this.getItem().getItem().canBeHurtBy(source)) {
-             return false;
-+        // Purpur start
-+        } else if (
-+                (immuneToCactus && source.is(net.minecraft.world.damagesource.DamageTypes.CACTUS)) ||
-+                (immuneToFire && (source.is(DamageTypeTags.IS_FIRE) && source.is(net.minecraft.world.damagesource.DamageTypes.IN_FIRE)) ||
-+                (immuneToLightning && source.is(net.minecraft.world.damagesource.DamageTypes.LIGHTNING_BOLT)) ||
-+                (immuneToExplosion && source.is(DamageTypeTags.IS_EXPLOSION)))
-+        ) {
-+            return false;
-+        // Purpur end
-         } else if (this.level.isClientSide) {
-             return true;
-         } else {
-@@ -547,6 +562,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
-         this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
-         this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
-         this.despawnRate = level.paperConfig().entities.spawning.altItemDespawnRate.enabled ? level.paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), level.spigotConfig.itemDespawnRate) : level.spigotConfig.itemDespawnRate; // Paper
-+        // Purpur start
-+        if (level.purpurConfig.itemImmuneToCactus.contains(stack.getItem())) immuneToCactus = true;
-+        if (level.purpurConfig.itemImmuneToExplosion.contains(stack.getItem())) immuneToExplosion = true;
-+        if (level.purpurConfig.itemImmuneToFire.contains(stack.getItem())) immuneToFire = true;
-+        if (level.purpurConfig.itemImmuneToLightning.contains(stack.getItem())) immuneToLightning = true;
-+        // level end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a925b5c490e7129b27370aa57b5fad1cf05530c6..09001578b88658c44d0661d340a0ee0f1ded6911 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -160,4 +160,46 @@ public class CraftItem extends CraftEntity implements Item {
-     public EntityType getType() {
-         return EntityType.DROPPED_ITEM;
-     }
-+
-+    // Purpur start
-+    @Override
-+    public void setImmuneToCactus(boolean immuneToCactus) {
-+        item.immuneToCactus = immuneToCactus;
-+    }
-+
-+    @Override
-+    public boolean isImmuneToCactus() {
-+        return item.immuneToCactus;
-+    }
-+
-+    @Override
-+    public void setImmuneToExplosion(boolean immuneToExplosion) {
-+        item.immuneToExplosion = immuneToExplosion;
-+    }
-+
-+    @Override
-+    public boolean isImmuneToExplosion() {
-+        return item.immuneToExplosion;
-+    }
-+
-+    @Override
-+    public void setImmuneToFire(boolean immuneToFire) {
-+        item.immuneToFire = immuneToFire;
-+    }
-+
-+    @Override
-+    public boolean isImmuneToFire() {
-+        return item.immuneToFire;
-+    }
-+
-+    @Override
-+    public void setImmuneToLightning(boolean immuneToLightning) {
-+        item.immuneToLightning = immuneToLightning;
-+    }
-+
-+    @Override
-+    public boolean isImmuneToLightning() {
-+        return item.immuneToLightning;
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 67ffbf096e4fcd29266eb329451213c72415e439..0ea436e503d76a7ee74c8ef30722dfd06ed7449f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -127,6 +127,49 @@ public class PurpurWorldConfig {
-         elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
-     }
- 
-+    public List<Item> itemImmuneToCactus = new ArrayList<>();
-+    public List<Item> itemImmuneToExplosion = new ArrayList<>();
-+    public List<Item> itemImmuneToFire = new ArrayList<>();
-+    public List<Item> itemImmuneToLightning = new ArrayList<>();
-+    private void itemSettings() {
-+        itemImmuneToCactus.clear();
-+        getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
-+            if (key.toString().equals("*")) {
-+                BuiltInRegistries.ITEM.stream().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToCactus.add(item));
-+                return;
-+            }
-+            Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(key.toString()));
-+            if (item != Items.AIR) itemImmuneToCactus.add(item);
-+        });
-+        itemImmuneToExplosion.clear();
-+        getList("gameplay-mechanics.item.immune.explosion", new ArrayList<>()).forEach(key -> {
-+            if (key.toString().equals("*")) {
-+                BuiltInRegistries.ITEM.stream().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToExplosion.add(item));
-+                return;
-+            }
-+            Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(key.toString()));
-+            if (item != Items.AIR) itemImmuneToExplosion.add(item);
-+        });
-+        itemImmuneToFire.clear();
-+        getList("gameplay-mechanics.item.immune.fire", new ArrayList<>()).forEach(key -> {
-+            if (key.toString().equals("*")) {
-+                BuiltInRegistries.ITEM.stream().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToFire.add(item));
-+                return;
-+            }
-+            Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(key.toString()));
-+            if (item != Items.AIR) itemImmuneToFire.add(item);
-+        });
-+        itemImmuneToLightning.clear();
-+        getList("gameplay-mechanics.item.immune.lightning", new ArrayList<>()).forEach(key -> {
-+            if (key.toString().equals("*")) {
-+                BuiltInRegistries.ITEM.stream().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToLightning.add(item));
-+                return;
-+            }
-+            Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(key.toString()));
-+            if (item != Items.AIR) itemImmuneToLightning.add(item);
-+        });
-+    }
-+
-     public double minecartMaxSpeed = 0.4D;
-     public boolean minecartPlaceAnywhere = false;
-     public boolean minecartControllable = false;
--- a/patches/todo/server/0064-Add-ping-command.patch
+++ b/patches/todo/server/0064-Add-ping-command.patch
@@ -1,77 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 13 Mar 2020 22:29:10 -0500
-Subject: [PATCH] Add ping command
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 34d1fad0ad4adfcb0372ab16ecd7af0b92b5bedc..dc34d1a2fe967d94eb6ea16b51f1b8da205f95b5 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -222,6 +222,7 @@ public class Commands {
-             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
-             StopCommand.register(this.dispatcher);
-             WhitelistCommand.register(this.dispatcher);
-+            org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
-         }
- 
-         if (environment.includeIntegrated) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 4905358e2a1939bfba963bda3fcf914721dfac45..a74932163207506e779c941c819eb663b98bd18c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -179,6 +179,7 @@ public class PurpurConfig {
-     public static boolean afkBroadcastUseDisplayName = false;
-     public static String afkTabListPrefix = "[AFK] ";
-     public static String afkTabListSuffix = "";
-+    public static String pingCommandOutput = "<green>%s's ping is %sms";
-     private static void messages() {
-         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-@@ -186,6 +187,7 @@ public class PurpurConfig {
-         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)));
-+        pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
-     }
- 
-     public static String serverModName = "Purpur";
-diff --git a/src/main/java/org/purpurmc/purpur/command/PingCommand.java b/src/main/java/org/purpurmc/purpur/command/PingCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..179727c6b3171c040d1aaf069525f61a9a2d54d9
--- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/command/PingCommand.java
-@@ -0,0 +1,33 @@
-+package org.purpurmc.purpur.command;
-+
-+import com.mojang.brigadier.CommandDispatcher;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands;
-+import net.minecraft.commands.arguments.EntityArgument;
-+import net.minecraft.server.level.ServerPlayer;
-+import org.purpurmc.purpur.PurpurConfig;
-+import org.bukkit.craftbukkit.util.CraftChatMessage;
-+
-+import java.util.Collection;
-+import java.util.Collections;
-+
-+public class PingCommand {
-+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-+        dispatcher.register(Commands.literal("ping")
-+                .requires((listener) -> listener.hasPermission(2, "bukkit.command.ping"))
-+                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
-+                .then(Commands.argument("targets", EntityArgument.players())
-+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.ping.other"))
-+                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
-+                )
-+        );
-+    }
-+
-+    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {
-+        for (ServerPlayer player : targets) {
-+            String output = String.format(PurpurConfig.pingCommandOutput, player.getGameProfile().getName(), player.latency);
-+            sender.sendSuccess(output, false);
-+        }
-+        return targets.size();
-+    }
-+}
--- a/patches/todo/server/0065-Add-demo-command.patch
+++ b/patches/todo/server/0065-Add-demo-command.patch
@@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 30 Nov 2020 03:12:04 -0600
-Subject: [PATCH] Add demo command
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index dc34d1a2fe967d94eb6ea16b51f1b8da205f95b5..a7c26527eb282d2f80fa14d265b748f7a41a7ebe 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -222,6 +222,7 @@ public class Commands {
-             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
-             StopCommand.register(this.dispatcher);
-             WhitelistCommand.register(this.dispatcher);
-+            org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
-             org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
-         }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a74932163207506e779c941c819eb663b98bd18c..235db276a07017bf89e6311a0b84291e8a0af06b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -179,6 +179,7 @@ public class PurpurConfig {
-     public static boolean afkBroadcastUseDisplayName = false;
-     public static String afkTabListPrefix = "[AFK] ";
-     public static String afkTabListSuffix = "";
-+    public static String demoCommandOutput = "<green>%s has been shown the demo screen";
-     public static String pingCommandOutput = "<green>%s's ping is %sms";
-     private static void messages() {
-         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-@@ -187,6 +188,7 @@ public class PurpurConfig {
-         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)));
-+        demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
-         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/command/DemoCommand.java b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..235f3cd89f675b70a6152a00534608c0902f19fd
--- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java
-@@ -0,0 +1,35 @@
-+package org.purpurmc.purpur.command;
-+
-+import com.mojang.brigadier.CommandDispatcher;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands;
-+import net.minecraft.commands.arguments.EntityArgument;
-+import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
-+import net.minecraft.server.level.ServerPlayer;
-+import org.purpurmc.purpur.PurpurConfig;
-+
-+import java.util.Collection;
-+import java.util.Collections;
-+
-+public class DemoCommand {
-+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-+        dispatcher.register(Commands.literal("demo")
-+                .requires((listener) -> listener.hasPermission(2, "bukkit.command.demo"))
-+                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
-+                .then(Commands.argument("targets", EntityArgument.players())
-+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.demo.other"))
-+                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
-+                )
-+        );
-+    }
-+
-+    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {
-+        for (ServerPlayer player : targets) {
-+            ClientboundGameEventPacket packet = new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 0);
-+            player.connection.send(packet);
-+            String output = String.format(PurpurConfig.demoCommandOutput, player.getGameProfile().getName());
-+            sender.sendSuccess(output, false);
-+        }
-+        return targets.size();
-+    }
-+}
--- a/patches/todo/server/0066-Add-credits-command.patch
+++ b/patches/todo/server/0066-Add-credits-command.patch
@@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Encode42 <me@encode42.dev>
-Date: Fri, 30 Apr 2021 14:03:06 -0400
-Subject: [PATCH] Add credits command
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index a7c26527eb282d2f80fa14d265b748f7a41a7ebe..277fb799d898ca726205519b1516861901be33c5 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -222,6 +222,7 @@ public class Commands {
-             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
-             StopCommand.register(this.dispatcher);
-             WhitelistCommand.register(this.dispatcher);
-+            org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
-             org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
-             org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
-         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 235db276a07017bf89e6311a0b84291e8a0af06b..8e99128759e555cdef0efe9cea1b3b36f2c3fda9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -179,6 +179,7 @@ public class PurpurConfig {
-     public static boolean afkBroadcastUseDisplayName = false;
-     public static String afkTabListPrefix = "[AFK] ";
-     public static String afkTabListSuffix = "";
-+    public static String creditsCommandOutput = "<green>%s has been shown the end credits";
-     public static String demoCommandOutput = "<green>%s has been shown the demo screen";
-     public static String pingCommandOutput = "<green>%s's ping is %sms";
-     private static void messages() {
-@@ -188,6 +189,7 @@ public class PurpurConfig {
-         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)));
-+        creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
-         demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
-         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
-     }
-diff --git a/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..40d2fab4a9728ac90c36e30c130f3116b7025d11
--- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java
-@@ -0,0 +1,35 @@
-+package org.purpurmc.purpur.command;
-+
-+import com.mojang.brigadier.CommandDispatcher;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands;
-+import net.minecraft.commands.arguments.EntityArgument;
-+import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
-+import net.minecraft.server.level.ServerPlayer;
-+import org.purpurmc.purpur.PurpurConfig;
-+
-+import java.util.Collection;
-+import java.util.Collections;
-+
-+public class CreditsCommand {
-+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-+        dispatcher.register(Commands.literal("credits")
-+                .requires((listener) -> listener.hasPermission(2, "bukkit.command.credits"))
-+                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
-+                .then(Commands.argument("targets", EntityArgument.players())
-+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.credits.other"))
-+                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
-+                )
-+        );
-+    }
-+
-+    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {
-+        for (ServerPlayer player : targets) {
-+            ClientboundGameEventPacket packet = new ClientboundGameEventPacket(ClientboundGameEventPacket.WIN_GAME, 1F);
-+            player.connection.send(packet);
-+            String output = String.format(PurpurConfig.creditsCommandOutput, player.getGameProfile().getName());
-+            sender.sendSuccess(output, false);
-+        }
-+        return targets.size();
-+    }
-+}
--- a/patches/todo/server/0067-Configurable-jockey-options.patch
+++ b/patches/todo/server/0067-Configurable-jockey-options.patch
@@ -1,271 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 26 Mar 2020 21:39:32 -0500
-Subject: [PATCH] Configurable jockey options
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 0139d890c22db09c4b67a1e1bcf179a6571c7cd6..863fd15039e53405aac66d769598a38ac2586115 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -93,6 +93,21 @@ public class Drowned extends Zombie implements RangedAttackMob {
-     protected void randomizeReinforcementsChance() {
-         this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level.purpurConfig.drownedSpawnReinforcements);
-     }
-+
-+    @Override
-+    public boolean jockeyOnlyBaby() {
-+        return level.purpurConfig.drownedJockeyOnlyBaby;
-+    }
-+
-+    @Override
-+    public double jockeyChance() {
-+        return level.purpurConfig.drownedJockeyChance;
-+    }
-+
-+    @Override
-+    public boolean jockeyTryExistingChickens() {
-+        return level.purpurConfig.drownedJockeyTryExistingChickens;
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 4dc604f2d36494bbe139b7ef4649089207dd092f..58006eab96f505215053203bff6853ca784468f5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -47,6 +47,21 @@ public class Husk extends Zombie {
-     protected void randomizeReinforcementsChance() {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level.purpurConfig.huskSpawnReinforcements);
-     }
-+
-+    @Override
-+    public boolean jockeyOnlyBaby() {
-+        return level.purpurConfig.huskJockeyOnlyBaby;
-+    }
-+
-+    @Override
-+    public double jockeyChance() {
-+        return level.purpurConfig.huskJockeyChance;
-+    }
-+
-+    @Override
-+    public boolean jockeyTryExistingChickens() {
-+        return level.purpurConfig.huskJockeyTryExistingChickens;
-+    }
-     // Purpur end
- 
-     public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 77712e0bb78bef24f05d9949c3ae4ee7ec2efb96..fb41431f25081c8ca0cf03dc5128f78f589e4e26 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -126,6 +126,18 @@ public class Zombie extends Monster {
-     public void initAttributes() {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.zombieMaxHealth);
-     }
-+
-+    public boolean jockeyOnlyBaby() {
-+        return level.purpurConfig.zombieJockeyOnlyBaby;
-+    }
-+
-+    public double jockeyChance() {
-+        return level.purpurConfig.zombieJockeyChance;
-+    }
-+
-+    public boolean jockeyTryExistingChickens() {
-+        return level.purpurConfig.zombieJockeyTryExistingChickens;
-+    }
-     // Purpur end
- 
-     @Override
-@@ -551,19 +563,20 @@ public class Zombie extends Monster {
-         if (object instanceof Zombie.ZombieGroupData) {
-             Zombie.ZombieGroupData entityzombie_groupdatazombie = (Zombie.ZombieGroupData) object;
- 
-            if (entityzombie_groupdatazombie.isBaby) {
-                this.setBaby(true);
-+            // Purpur start
-+            if (!jockeyOnlyBaby() || entityzombie_groupdatazombie.isBaby) {
-+                this.setBaby(entityzombie_groupdatazombie.isBaby);
-                 if (entityzombie_groupdatazombie.canSpawnJockey) {
-                    if ((double) randomsource.nextFloat() < 0.05D) {
-                        List<Chicken> list = world.getEntitiesOfClass(Chicken.class, this.getBoundingBox().inflate(5.0D, 3.0D, 5.0D), EntitySelector.ENTITY_NOT_BEING_RIDDEN);
-+                    if ((double) randomsource.nextFloat() < jockeyChance()) {
-+                        List<Chicken> list = jockeyTryExistingChickens() ? world.getEntitiesOfClass(Chicken.class, this.getBoundingBox().inflate(5.0D, 3.0D, 5.0D), EntitySelector.ENTITY_NOT_BEING_RIDDEN) : java.util.Collections.emptyList();
-+                        // Purpur end
- 
-                         if (!list.isEmpty()) {
-                             Chicken entitychicken = (Chicken) list.get(0);
- 
-                             entitychicken.setChickenJockey(true);
-                             this.startRiding(entitychicken);
-                        }
-                    } else if ((double) randomsource.nextFloat() < 0.05D) {
-+                        } else { // Purpur
-                         Chicken entitychicken1 = (Chicken) EntityType.CHICKEN.create(this.level);
- 
-                         if (entitychicken1 != null) {
-@@ -573,6 +586,7 @@ public class Zombie extends Monster {
-                             this.startRiding(entitychicken1);
-                             world.addFreshEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
-                         }
-+                        } // Purpur
-                     }
-                 }
-             }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 073a45cd24c92e63b349a93da91cedfa10103101..9754f1d53cc5b2ea982531e0240c4fb41e4f1d35 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -104,6 +104,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
-     protected void randomizeReinforcementsChance() {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level.purpurConfig.zombieVillagerSpawnReinforcements);
-     }
-+
-+    @Override
-+    public boolean jockeyOnlyBaby() {
-+        return level.purpurConfig.zombieVillagerJockeyOnlyBaby;
-+    }
-+
-+    @Override
-+    public double jockeyChance() {
-+        return level.purpurConfig.zombieVillagerJockeyChance;
-+    }
-+
-+    @Override
-+    public boolean jockeyTryExistingChickens() {
-+        return level.purpurConfig.zombieVillagerJockeyTryExistingChickens;
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 2df1aa1af12b403e9cd87d61b2ff1516f754f589..f2c690c92dd2bf55f986f629ed79b76fbdfa32a4 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -83,6 +83,21 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
-     public void initAttributes() {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.zombifiedPiglinMaxHealth);
-     }
-+
-+    @Override
-+    public boolean jockeyOnlyBaby() {
-+        return level.purpurConfig.zombifiedPiglinJockeyOnlyBaby;
-+    }
-+
-+    @Override
-+    public double jockeyChance() {
-+        return level.purpurConfig.zombifiedPiglinJockeyChance;
-+    }
-+
-+    @Override
-+    public boolean jockeyTryExistingChickens() {
-+        return level.purpurConfig.zombifiedPiglinJockeyTryExistingChickens;
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0ea436e503d76a7ee74c8ef30722dfd06ed7449f..d98383a21bb7fbc64525e701add25f8d32499e9a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -590,6 +590,9 @@ public class PurpurWorldConfig {
-     public boolean drownedControllable = true;
-     public double drownedMaxHealth = 20.0D;
-     public double drownedSpawnReinforcements = 0.1D;
-+    public boolean drownedJockeyOnlyBaby = true;
-+    public double drownedJockeyChance = 0.05D;
-+    public boolean drownedJockeyTryExistingChickens = true;
-     private void drownedSettings() {
-         drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
-         drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -601,6 +604,9 @@ public class PurpurWorldConfig {
-         }
-         drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
-         drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
-+        drownedJockeyOnlyBaby = getBoolean("mobs.drowned.jockey.only-babies", drownedJockeyOnlyBaby);
-+        drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
-+        drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
-     }
- 
-     public boolean elderGuardianRidable = false;
-@@ -849,6 +855,9 @@ public class PurpurWorldConfig {
-     public boolean huskControllable = true;
-     public double huskMaxHealth = 20.0D;
-     public double huskSpawnReinforcements = 0.1D;
-+    public boolean huskJockeyOnlyBaby = true;
-+    public double huskJockeyChance = 0.05D;
-+    public boolean huskJockeyTryExistingChickens = true;
-     private void huskSettings() {
-         huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
-         huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
-@@ -860,6 +869,9 @@ public class PurpurWorldConfig {
-         }
-         huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
-         huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
-+        huskJockeyOnlyBaby = getBoolean("mobs.husk.jockey.only-babies", huskJockeyOnlyBaby);
-+        huskJockeyChance = getDouble("mobs.husk.jockey.chance", huskJockeyChance);
-+        huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
-     }
- 
-     public boolean illusionerRidable = false;
-@@ -1676,6 +1688,9 @@ public class PurpurWorldConfig {
-     public boolean zombieControllable = true;
-     public double zombieMaxHealth = 20.0D;
-     public double zombieSpawnReinforcements = 0.1D;
-+    public boolean zombieJockeyOnlyBaby = true;
-+    public double zombieJockeyChance = 0.05D;
-+    public boolean zombieJockeyTryExistingChickens = true;
-     private void zombieSettings() {
-         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
-         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1687,6 +1702,9 @@ public class PurpurWorldConfig {
-         }
-         zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
-         zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
-+        zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
-+        zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
-+        zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
-     }
- 
-     public boolean zombieHorseRidableInWater = false;
-@@ -1721,6 +1739,9 @@ public class PurpurWorldConfig {
-     public boolean zombieVillagerControllable = true;
-     public double zombieVillagerMaxHealth = 20.0D;
-     public double zombieVillagerSpawnReinforcements = 0.1D;
-+    public boolean zombieVillagerJockeyOnlyBaby = true;
-+    public double zombieVillagerJockeyChance = 0.05D;
-+    public boolean zombieVillagerJockeyTryExistingChickens = true;
-     private void zombieVillagerSettings() {
-         zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
-         zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1732,6 +1753,9 @@ public class PurpurWorldConfig {
-         }
-         zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
-         zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
-+        zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
-+        zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
-+        zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
-     }
- 
-     public boolean zombifiedPiglinRidable = false;
-@@ -1739,6 +1763,9 @@ public class PurpurWorldConfig {
-     public boolean zombifiedPiglinControllable = true;
-     public double zombifiedPiglinMaxHealth = 20.0D;
-     public double zombifiedPiglinSpawnReinforcements = 0.0D;
-+    public boolean zombifiedPiglinJockeyOnlyBaby = true;
-+    public double zombifiedPiglinJockeyChance = 0.05D;
-+    public boolean zombifiedPiglinJockeyTryExistingChickens = true;
-     private void zombifiedPiglinSettings() {
-         zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
-         zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1750,5 +1777,8 @@ public class PurpurWorldConfig {
-         }
-         zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
-         zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);
-+        zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
-+        zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
-+        zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
-     }
- }
--- a/patches/todo/server/0069-Add-phantom-spawning-options.patch
+++ b/patches/todo/server/0069-Add-phantom-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: Fri, 3 Jul 2020 00:03:52 -0500
-Subject: [PATCH] Add phantom spawning options
-
-
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index e8ae4449696d73c8c9b8b27d4d2e20db933a72cc..f55c50f6637a4f930b15565d6ac82bb4f27b9059 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -51,7 +51,7 @@ public class PhantomSpawner implements CustomSpawner {
-                 int spawnAttemptMaxSeconds = world.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds;
-                 this.nextTick += (spawnAttemptMinSeconds + randomsource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20;
-                 // Paper end
-                if (world.getSkyDarken() < 5 && world.dimensionType().hasSkyLight()) {
-+                if (world.getSkyDarken() < world.purpurConfig.phantomSpawnMinSkyDarkness && world.dimensionType().hasSkyLight()) { // Purpur
-                     return 0;
-                 } else {
-                     int i = 0;
-@@ -63,10 +63,10 @@ public class PhantomSpawner implements CustomSpawner {
-                         if (!entityhuman.isSpectator() && (!world.paperConfig().entities.behavior.phantomsDoNotSpawnOnCreativePlayers || !entityhuman.isCreative())) { // Paper
-                             BlockPos blockposition = entityhuman.blockPosition();
- 
-                            if (!world.dimensionType().hasSkyLight() || blockposition.getY() >= world.getSeaLevel() && world.canSeeSky(blockposition)) {
-+                            if (!world.dimensionType().hasSkyLight() || (!world.purpurConfig.phantomSpawnOnlyAboveSeaLevel || blockposition.getY() >= world.getSeaLevel()) && (!world.purpurConfig.phantomSpawnOnlyWithVisibleSky || world.canSeeSky(blockposition))) { // Purpur
-                                 DifficultyInstance difficultydamagescaler = world.getCurrentDifficultyAt(blockposition);
- 
-                                if (difficultydamagescaler.isHarderThan(randomsource.nextFloat() * 3.0F)) {
-+                                if (difficultydamagescaler.isHarderThan(randomsource.nextFloat() * (float) world.purpurConfig.phantomSpawnLocalDifficultyChance)) { // Purpur
-                                     ServerStatsCounter serverstatisticmanager = ((ServerPlayer) entityhuman).getStats();
-                                     int j = Mth.clamp(serverstatisticmanager.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
-                                     boolean flag2 = true;
-@@ -78,7 +78,7 @@ public class PhantomSpawner implements CustomSpawner {
- 
-                                         if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
-                                             SpawnGroupData groupdataentity = null;
-                                            int k = 1 + randomsource.nextInt(difficultydamagescaler.getDifficulty().getId() + 1);
-+                                            int k = world.purpurConfig.phantomSpawnMinPerAttempt + world.random.nextInt((world.purpurConfig.phantomSpawnMaxPerAttempt < 0 ? difficultydamagescaler.getDifficulty().getId() : world.purpurConfig.phantomSpawnMaxPerAttempt - world.purpurConfig.phantomSpawnMinPerAttempt) + 1); // Purpur
- 
-                                             for (int l = 0; l < k; ++l) {
-                                                 // Paper start
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 20573f2979277aa53f5377974ad910ec4428c435..f3502992e3c7eaa955c793acce3b8fc07e7c9a93 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1070,6 +1070,12 @@ public class PurpurWorldConfig {
-     public double phantomAttackedByCrystalRadius = 0.0D;
-     public float phantomAttackedByCrystalDamage = 1.0F;
-     public double phantomOrbitCrystalRadius = 0.0D;
-+    public int phantomSpawnMinSkyDarkness = 5;
-+    public boolean phantomSpawnOnlyAboveSeaLevel = true;
-+    public boolean phantomSpawnOnlyWithVisibleSky = true;
-+    public double phantomSpawnLocalDifficultyChance = 3.0D;
-+    public int phantomSpawnMinPerAttempt = 1;
-+    public int phantomSpawnMaxPerAttempt = -1;
-     private void phantomSettings() {
-         phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
-         phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -1094,6 +1100,12 @@ public class PurpurWorldConfig {
-         phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
-         phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
-         phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
-+        phantomSpawnMinSkyDarkness = getInt("mobs.phantom.spawn.min-sky-darkness", phantomSpawnMinSkyDarkness);
-+        phantomSpawnOnlyAboveSeaLevel = getBoolean("mobs.phantom.spawn.only-above-sea-level", phantomSpawnOnlyAboveSeaLevel);
-+        phantomSpawnOnlyWithVisibleSky = getBoolean("mobs.phantom.spawn.only-with-visible-sky", phantomSpawnOnlyWithVisibleSky);
-+        phantomSpawnLocalDifficultyChance = getDouble("mobs.phantom.spawn.local-difficulty-chance", phantomSpawnLocalDifficultyChance);
-+        phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
-+        phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);
-     }
- 
-     public boolean pigRidable = false;
--- a/patches/todo/server/0070-Implement-bed-explosion-options.patch
+++ b/patches/todo/server/0070-Implement-bed-explosion-options.patch
@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 4 Jul 2020 13:12:43 -0500
-Subject: [PATCH] Implement bed explosion options
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index d1d5363ab1742add8ff45507a303106f4d65f52f..ea448ef3e072f4144e6f506f1f38399ecd571d76 100644
--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -97,7 +97,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
- 
-                 Vec3 vec3d = pos.getCenter();
- 
-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Purpur
-                 return InteractionResult.SUCCESS;
-             } else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
-                 if (!BedBlock.canSetSpawn(world)) return this.explodeBed(state, world, pos); // Paper - check explode first
-@@ -150,7 +150,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
- 
-                 Vec3 vec3d = blockposition.getCenter();
- 
-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Purpur
-                 return InteractionResult.SUCCESS;
-             }
-         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f3502992e3c7eaa955c793acce3b8fc07e7c9a93..b647527fe6214ca803fad96a8d739811dd2a3a06 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -290,6 +290,27 @@ public class PurpurWorldConfig {
-         });
-     }
- 
-+    public boolean bedExplode = true;
-+    public double bedExplosionPower = 5.0D;
-+    public boolean bedExplosionFire = true;
-+    public net.minecraft.world.level.Level.ExplosionInteraction bedExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
-+    private void bedSettings() {
-+        if (PurpurConfig.version < 31) {
-+            if ("DESTROY".equals(getString("blocks.bed.explosion-effect", bedExplosionEffect.name()))) {
-+                set("blocks.bed.explosion-effect", "BLOCK");
-+            }
-+        }
-+        bedExplode = getBoolean("blocks.bed.explode", bedExplode);
-+        bedExplosionPower = getDouble("blocks.bed.explosion-power", bedExplosionPower);
-+        bedExplosionFire = getBoolean("blocks.bed.explosion-fire", bedExplosionFire);
-+        try {
-+            bedExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.valueOf(getString("blocks.bed.explosion-effect", bedExplosionEffect.name()));
-+        } catch (IllegalArgumentException e) {
-+            log(Level.SEVERE, "Unknown value for `blocks.bed.explosion-effect`! Using default of `BLOCK`");
-+            bedExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
-+        }
-+    }
-+
-     public boolean dispenserApplyCursedArmor = true;
-     private void dispenserSettings() {
-         dispenserApplyCursedArmor = getBoolean("blocks.dispenser.apply-cursed-to-armor-slots", dispenserApplyCursedArmor);
--- a/patches/todo/server/0071-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/todo/server/0071-Implement-respawn-anchor-explosion-options.patch
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 4 Jul 2020 13:23:19 -0500
-Subject: [PATCH] Implement respawn anchor explosion options
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index 2ed78cf83c0ae66a6ddba1ff307da89a24b0d0a8..ae17d6a54fad0bd2d71d306f418b5ced2f11b863 100644
--- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -141,7 +141,7 @@ public class RespawnAnchorBlock extends Block {
-         };
-         Vec3 vec3d = explodedPos.getCenter();
- 
-        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper
-+        if (world.purpurConfig.respawnAnchorExplode)world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, (float) world.purpurConfig.respawnAnchorExplosionPower, world.purpurConfig.respawnAnchorExplosionFire, world.purpurConfig.respawnAnchorExplosionEffect); // Paper // Purpur
-     }
- 
-     public static boolean canSetSpawn(Level world) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b647527fe6214ca803fad96a8d739811dd2a3a06..482c145bb6d24de52c31bfa44d95f36428cabb7d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -330,6 +330,27 @@ public class PurpurWorldConfig {
-         lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
-     }
- 
-+    public boolean respawnAnchorExplode = true;
-+    public double respawnAnchorExplosionPower = 5.0D;
-+    public boolean respawnAnchorExplosionFire = true;
-+    public net.minecraft.world.level.Level.ExplosionInteraction respawnAnchorExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
-+    private void respawnAnchorSettings() {
-+        if (PurpurConfig.version < 31) {
-+            if ("DESTROY".equals(getString("blocks.respawn_anchor.explosion-effect", respawnAnchorExplosionEffect.name()))) {
-+                set("blocks.respawn_anchor.explosion-effect", "BLOCK");
-+            }
-+        }
-+        respawnAnchorExplode = getBoolean("blocks.respawn_anchor.explode", respawnAnchorExplode);
-+        respawnAnchorExplosionPower = getDouble("blocks.respawn_anchor.explosion-power", respawnAnchorExplosionPower);
-+        respawnAnchorExplosionFire = getBoolean("blocks.respawn_anchor.explosion-fire", respawnAnchorExplosionFire);
-+        try {
-+            respawnAnchorExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.valueOf(getString("blocks.respawn_anchor.explosion-effect", respawnAnchorExplosionEffect.name()));
-+        } catch (IllegalArgumentException e) {
-+            log(Level.SEVERE, "Unknown value for `blocks.respawn_anchor.explosion-effect`! Using default of `BLOCK`");
-+            respawnAnchorExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
-+        }
-+    }
-+
-     public boolean signRightClickEdit = false;
-     private void signSettings() {
-         signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
--- a/patches/todo/server/0072-Add-allow-water-in-end-world-option.patch
+++ b/patches/todo/server/0072-Add-allow-water-in-end-world-option.patch
@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 5 Jul 2020 23:40:16 -0500
-Subject: [PATCH] Add allow water in end world option
-
-
-diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
-index 5c6aa9c464784ad5ee366412d080c72d3d22a76f..c03abc9589bf5f37abc1b0d355ed9784bac31a93 100644
--- a/src/main/java/net/minecraft/world/item/BucketItem.java
-+++ b/src/main/java/net/minecraft/world/item/BucketItem.java
-@@ -166,7 +166,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
-             // CraftBukkit end
-             if (!flag1) {
-                 return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit
-            } else if (world.dimensionType().ultraWarm() && this.content.is(FluidTags.WATER)) {
-+            } else if ((world.dimensionType().ultraWarm() || (world.isTheEnd() && !org.purpurmc.purpur.PurpurConfig.allowWaterPlacementInTheEnd)) && this.content.is(FluidTags.WATER)) { // Purpur
-                 int i = blockposition.getX();
-                 int j = blockposition.getY();
-                 int k = blockposition.getZ();
-@@ -174,7 +174,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
-                 world.playSound(entityhuman, blockposition, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
- 
-                 for (int l = 0; l < 8; ++l) {
-                    world.addParticle(ParticleTypes.LARGE_SMOKE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D);
-+                    ((ServerLevel) world).sendParticles(null, ParticleTypes.LARGE_SMOKE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 1, 0.0D, 0.0D, 0.0D, 0.0D, true); // Purpur
-                 }
- 
-                 return true;
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c38aff50c6f0bc37e539bb4d5206f7b6065fa680..d0e0ce953dd0cdd6b54bb00224e82dca62f793cd 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1650,4 +1650,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         return null;
-     }
-     // Paper end
-+
-+    // Purpur start
-+    public boolean isNether() {
-+        return getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER;
-+    }
-+
-+    public boolean isTheEnd() {
-+        return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/IceBlock.java b/src/main/java/net/minecraft/world/level/block/IceBlock.java
-index 5ecf02ce83b7496c977adfeb203b8eadb05f9da5..bf7f1ac5c691c0c4c30c124970f4b08a8108ad34 100644
--- a/src/main/java/net/minecraft/world/level/block/IceBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/IceBlock.java
-@@ -31,7 +31,7 @@ public class IceBlock extends HalfTransparentBlock {
-     public void afterDestroy(Level world, BlockPos pos, ItemStack tool) {
-         // Paper end
-         if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) == 0) {
-            if (world.dimensionType().ultraWarm()) {
-+            if (world.isNether() || (world.isTheEnd() && !org.purpurmc.purpur.PurpurConfig.allowWaterPlacementInTheEnd)) { // Purpur
-                 world.removeBlock(pos, false);
-                 return;
-             }
-@@ -59,7 +59,7 @@ public class IceBlock extends HalfTransparentBlock {
-             return;
-         }
-         // CraftBukkit end
-        if (world.dimensionType().ultraWarm()) {
-+        if (world.isNether() || (world.isTheEnd() && !org.purpurmc.purpur.PurpurConfig.allowWaterPlacementInTheEnd)) { // Purpur
-             world.removeBlock(pos, false);
-         } else {
-             world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8e99128759e555cdef0efe9cea1b3b36f2c3fda9..8575753af39d19e485f915e3e12e377c325b4751 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -244,6 +244,11 @@ public class PurpurConfig {
-         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
-     }
- 
-+    public static boolean allowWaterPlacementInTheEnd = true;
-+    private static void allowWaterPlacementInEnd() {
-+        allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
-+    }
-+
-     public static boolean loggerSuppressInitLegacyMaterialError = false;
-     public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
-     public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
--- a/patches/todo/server/0073-Allow-color-codes-in-books.patch
+++ b/patches/todo/server/0073-Allow-color-codes-in-books.patch
@@ -1,77 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Tue, 3 Nov 2020 01:25:06 -0600
-Subject: [PATCH] Allow color codes in books
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f7b3110cf30124fc4054bfcda6d5ad28a5c0a48c..556a9fcf0efd08cfc2b60acf79e74bfdb254903d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1342,13 +1342,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                 itemstack1.setTag(nbttagcompound.copy());
-             }
- 
-+            // Purpur start
-+            boolean hasPerm = getCraftPlayer().hasPermission("purpur.book.color.edit") || getCraftPlayer().hasPermission("purpur.book.color.sign");
-             itemstack1.addTagElement("author", StringTag.valueOf(this.player.getName().getString()));
-             if (this.player.isTextFilteringEnabled()) {
-                itemstack1.addTagElement("title", StringTag.valueOf(title.filteredOrEmpty()));
-+                itemstack1.addTagElement("title", StringTag.valueOf(color(title.filteredOrEmpty(), hasPerm)));
-             } else {
-                itemstack1.addTagElement("filtered_title", StringTag.valueOf(title.filteredOrEmpty()));
-                itemstack1.addTagElement("title", StringTag.valueOf(title.raw()));
-+                itemstack1.addTagElement("filtered_title", StringTag.valueOf(color(title.filteredOrEmpty(), hasPerm)));
-+                itemstack1.addTagElement("title", StringTag.valueOf(color(title.raw(), hasPerm)));
-             }
-+            // Purpur end
- 
-             this.updateBookPages(pages, (s) -> {
-                 return Component.Serializer.toJson(Component.literal(s));
-@@ -1360,10 +1363,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-     private void updateBookPages(List<FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
-         ListTag nbttaglist = new ListTag();
- 
-+        // Purpur start
-+        boolean hasPerm = getCraftPlayer().hasPermission("purpur.book.color.edit");
-         if (this.player.isTextFilteringEnabled()) {
-            Stream<StringTag> stream = list.stream().map((filteredtext) -> { // CraftBukkit - decompile error
-                return StringTag.valueOf((String) unaryoperator.apply(filteredtext.filteredOrEmpty()));
-+            Stream<StringTag> stream = list.stream().map(s -> color(s.filteredOrEmpty(), hasPerm, false)).map((s) -> { // CraftBukkit - decompile error
-+                return StringTag.valueOf((String) unaryoperator.apply(s));
-             });
-+            // Purpur end
- 
-             Objects.requireNonNull(nbttaglist);
-             stream.forEach(nbttaglist::add);
-@@ -1373,11 +1379,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-             for (int j = list.size(); i < j; ++i) {
-                 FilteredText filteredtext = (FilteredText) list.get(i);
-                String s = filteredtext.raw();
-+                String s = color(filteredtext.raw(), hasPerm, false); // Purpur
- 
-                 nbttaglist.add(StringTag.valueOf((String) unaryoperator.apply(s)));
-                 if (filteredtext.isFiltered()) {
-                    nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply(filteredtext.filteredOrEmpty()));
-+                    nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply((String) color(filteredtext.filteredOrEmpty(), hasPerm, false))); // Purpur
-                 }
-             }
- 
-@@ -1390,6 +1396,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-         this.player.getInventory().setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
-     }
- 
-+    // Purpur start
-+    private String color(String str, boolean hasPerm) {
-+        return color(str, hasPerm, true);
-+    }
-+
-+    private String color(String str, boolean hasPerm, boolean parseHex) {
-+        return hasPerm ? org.bukkit.ChatColor.color(str, parseHex) : str;
-+    }
-+    // Purpur end
-+
-     @Override
-     public void handleEntityTagQuery(ServerboundEntityTagQuery packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
--- a/patches/todo/server/0074-Entity-lifespan.patch
+++ b/patches/todo/server/0074-Entity-lifespan.patch
@@ -1,112 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 11 Jul 2020 19:41:34 -0500
-Subject: [PATCH] Entity lifespan
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 556a9fcf0efd08cfc2b60acf79e74bfdb254903d..d4280dcd4b8a4e09ef1b6c6d89ea5c58468f7229 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2861,6 +2861,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-             AABB axisalignedbb = entity.getBoundingBox();
- 
-             if (axisalignedbb.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {
-+                if (entity instanceof Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur
-                 packet.dispatch(new ServerboundInteractPacket.Handler() {
-                     private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
-                         ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 89981efcb852fed1ca79f8b239aa1f044d713c6d..183261a031a2a0b6b95dbb983236cee3cd3a0398 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -134,6 +134,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-     private BlockPos restrictCenter;
-     private float restrictRadius;
- 
-+    public int ticksSinceLastInteraction; // Purpur
-     public boolean aware = true; // CraftBukkit
- 
-     protected Mob(EntityType<? extends Mob> type, Level world) {
-@@ -320,6 +321,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-                 entityliving = null;
-             }
-         }
-+        if (entityliving instanceof ServerPlayer) this.ticksSinceLastInteraction = 0; // Purpur
-         this.target = entityliving;
-         return true;
-         // CraftBukkit end
-@@ -366,9 +368,29 @@ public abstract class Mob extends LivingEntity implements Targeting {
-             this.playAmbientSound();
-         }
- 
-+        incrementTicksSinceLastInteraction(); // Purpur
-         this.level.getProfiler().pop();
-     }
- 
-+    // Purpur start
-+    private void incrementTicksSinceLastInteraction() {
-+        ++this.ticksSinceLastInteraction;
-+        if (getRider() != null) {
-+            this.ticksSinceLastInteraction = 0;
-+            return;
-+        }
-+        if (this.level.purpurConfig.entityLifeSpan <= 0) {
-+            return; // feature disabled
-+        }
-+        if (!this.removeWhenFarAway(0) || isPersistenceRequired() || requiresCustomPersistence() || hasCustomName()) {
-+            return; // mob persistent
-+        }
-+        if (this.ticksSinceLastInteraction > this.level.purpurConfig.entityLifeSpan) {
-+            this.discard();
-+        }
-+    }
-+    // Purpur end
-+
-     @Override
-     protected void playHurtSound(DamageSource source) {
-         this.resetAmbientSoundTime();
-@@ -558,6 +580,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         }
- 
-         nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
-+        nbt.putInt("Purpur.ticksSinceLastInteraction", this.ticksSinceLastInteraction); // Purpur
-     }
- 
-     @Override
-@@ -628,6 +651,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
-             this.aware = nbt.getBoolean("Bukkit.Aware");
-         }
-         // CraftBukkit end
-+        // Purpur start
-+        if (nbt.contains("Purpur.ticksSinceLastInteraction")) {
-+            this.ticksSinceLastInteraction = nbt.getInt("Purpur.ticksSinceLastInteraction");
-+        }
-+        // Purpur end
-     }
- 
-     @Override
-@@ -1692,6 +1720,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-             this.setLastHurtMob(target);
-         }
- 
-+        if (target instanceof ServerPlayer) this.ticksSinceLastInteraction = 0; // Purpur
-         return flag;
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 482c145bb6d24de52c31bfa44d95f36428cabb7d..a144a767cc7f7ba6c7e7d342ef9c9e3f84a9f20e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
-         elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
-     }
- 
-+    public int entityLifeSpan = 0;
-+    private void entitySettings() {
-+        entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan);
-+    }
-+
-     public List<Item> itemImmuneToCactus = new ArrayList<>();
-     public List<Item> itemImmuneToExplosion = new ArrayList<>();
-     public List<Item> itemImmuneToFire = new ArrayList<>();
--- a/patches/todo/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/todo/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 13 Jul 2020 11:40:00 -0500
-Subject: [PATCH] Add option to teleport to spawn if outside world border
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c481110ae2d2c792856a4140d63747bb5afc65c6..7ccc2faa622082e2c06ce3906b22e3079a486711 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2673,4 +2673,26 @@ public class ServerPlayer extends Player {
-         return (CraftPlayer) super.getBukkitEntity();
-     }
-     // CraftBukkit end
-+
-+    // Purpur start
-+    public void teleport(Location to) {
-+        this.ejectPassengers();
-+        this.stopRiding(true);
-+
-+        if (this.isSleeping()) {
-+            this.stopSleepInBed(true, false);
-+        }
-+
-+        if (this.containerMenu != this.inventoryMenu) {
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT);
-+        }
-+
-+        ServerLevel toLevel = ((CraftWorld) to.getWorld()).getHandle();
-+        if (this.level == toLevel) {
-+            this.connection.internalTeleport(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch(), java.util.EnumSet.noneOf(net.minecraft.world.entity.RelativeMovement.class));
-+        } else {
-+            this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
-+        }
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a8ace2c448ddae71e8e64f232c75d541aa531f3f..587a88a0c4954cba28fbdb31228ec81f2ba59b82 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -410,6 +410,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                         double d1 = this.level.getWorldBorder().getDamagePerBlock();
- 
-                         if (d1 > 0.0D) {
-+                        if (level.purpurConfig.teleportIfOutsideBorder && this instanceof ServerPlayer) { ((ServerPlayer) this).teleport(io.papermc.paper.util.MCUtil.toLocation(level, ((ServerLevel) level).getSharedSpawnPos())); return; } // Purpur
-                             this.hurt(this.damageSources().inWall(), (float) Math.max(1, Mth.floor(-d0 * d1)));
-                         }
-                     }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a144a767cc7f7ba6c7e7d342ef9c9e3f84a9f20e..8a0d0406440a43683641dcd6e43f75da5db9c734 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -246,6 +246,7 @@ public class PurpurWorldConfig {
-     public boolean playerInvulnerableWhileAcceptingResourcePack = false;
-     public String playerDeathExpDropEquation = "expLevel * 7";
-     public int playerDeathExpDropMax = 100;
-+    public boolean teleportIfOutsideBorder = false;
-     private void playerSettings() {
-         if (PurpurConfig.version < 19) {
-             boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -261,6 +262,7 @@ public class PurpurWorldConfig {
-         playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
-         playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
-         playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
-+        teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
-     }
- 
-     public boolean silkTouchEnabled = false;
--- a/patches/todo/server/0076-Squid-EAR-immunity.patch
+++ b/patches/todo/server/0076-Squid-EAR-immunity.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 13 Jul 2020 13:49:41 -0500
-Subject: [PATCH] Squid EAR immunity
-
-
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8a0d0406440a43683641dcd6e43f75da5db9c734..b7e811c786db1a4749acdc9309f841e6f1d615e5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {
-     public boolean squidRidable = false;
-     public boolean squidControllable = true;
-     public double squidMaxHealth = 10.0D;
-+    public boolean squidImmuneToEAR = true;
-     private void squidSettings() {
-         squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
-         squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1464,6 +1465,7 @@ public class PurpurWorldConfig {
-             set("mobs.squid.attributes.max_health", oldValue);
-         }
-         squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
-+        squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
-     }
- 
-     public boolean spiderRidable = false;
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1f37695950e69fc9784a415a5ab9c6586ed32e61..d9448a222bbe2cbd09debfb93f339b175ed44c92 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;
- import net.minecraft.world.entity.animal.Animal;
- import net.minecraft.world.entity.animal.Bee;
- import net.minecraft.world.entity.animal.Sheep;
-+import net.minecraft.world.entity.animal.Squid;
- import net.minecraft.world.entity.animal.WaterAnimal;
- import net.minecraft.world.entity.animal.horse.Llama;
- import net.minecraft.world.entity.boss.EnderDragonPart;
-@@ -397,6 +398,7 @@ public class ActivationRange
-      */
-     public static boolean checkIfActive(Entity entity)
-     {
-+        if (entity.level.purpurConfig.squidImmuneToEAR && entity instanceof Squid) return true; // Purpur
-         // Never safe to skip fireworks or entities not yet added to chunk
-         if ( entity instanceof FireworkRocketEntity ) {
-             return true;
--- a/patches/todo/server/0077-Phantoms-burn-in-light.patch
+++ b/patches/todo/server/0077-Phantoms-burn-in-light.patch
@@ -1,78 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: draycia <lonelyyordle@gmail.com>
-Date: Sun, 12 Apr 2020 20:41:59 -0700
-Subject: [PATCH] Phantoms burn in light
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index fd02dfb905c71fa10e0830cf0a02d4b63b81f23f..b601c542e28bc0a588e56aa37c243fe92145547e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -50,6 +50,7 @@ public class Phantom extends FlyingMob implements Enemy {
-     public BlockPos anchorPoint;
-     Phantom.AttackPhase attackPhase;
-     Vec3 crystalPosition; // Purpur
-+    private static final net.minecraft.world.item.crafting.Ingredient TORCH = net.minecraft.world.item.crafting.Ingredient.of(net.minecraft.world.item.Items.TORCH, net.minecraft.world.item.Items.SOUL_TORCH); // Purpur
- 
-     public Phantom(EntityType<? extends Phantom> type, Level world) {
-         super(type, world);
-@@ -247,8 +248,12 @@ public class Phantom extends FlyingMob implements Enemy {
- 
-     @Override
-     public void aiStep() {
-        if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
-            if (getRider() == null || !this.isControllable()) // Purpur
-+        // Purpur start
-+        boolean burnFromDaylight = this.shouldBurnInDay && this.level.purpurConfig.phantomBurnInDaylight;
-+        boolean burnFromLightSource = this.level.purpurConfig.phantomBurnInLight > 0 && this.level.getMaxLocalRawBrightness(blockPosition()) >= this.level.purpurConfig.phantomBurnInLight;
-+        if (this.isAlive() && (burnFromDaylight || burnFromLightSource)) { // Paper - Configurable Burning
-+            if (getRider() == null || !this.isControllable())
-+            // Purpur end
-             this.setSecondsOnFire(8);
-         }
- 
-@@ -657,6 +662,12 @@ public class Phantom extends FlyingMob implements Enemy {
-                 return false;
-             } else if (!entityliving.isAlive()) {
-                 return false;
-+            // Purpur start
-+            } else if (level.purpurConfig.phantomBurnInLight > 0 && level.getLightEmission(new BlockPos(Phantom.this)) >= level.purpurConfig.phantomBurnInLight) {
-+                return false;
-+            } else if (level.purpurConfig.phantomIgnorePlayersWithTorch && (TORCH.test(entityliving.getItemInHand(net.minecraft.world.InteractionHand.MAIN_HAND)) || TORCH.test(entityliving.getItemInHand(net.minecraft.world.InteractionHand.OFF_HAND)))) {
-+                return false;
-+            // Purpur end
-             } else {
-                 if (entityliving instanceof Player) {
-                     Player entityhuman = (Player) entityliving;
-@@ -802,6 +813,7 @@ public class Phantom extends FlyingMob implements Enemy {
-                 this.nextScanTick = reducedTickDelay(60);
-                 List<Player> list = Phantom.this.level.getNearbyPlayers(this.attackTargeting, Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
- 
-+                if (level.purpurConfig.phantomIgnorePlayersWithTorch) list.removeIf(human -> TORCH.test(human.getItemInHand(net.minecraft.world.InteractionHand.MAIN_HAND)) || TORCH.test(human.getItemInHand(net.minecraft.world.InteractionHand.OFF_HAND)));// Purpur
-                 if (!list.isEmpty()) {
-                     list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error
-                     Iterator iterator = list.iterator();
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b7e811c786db1a4749acdc9309f841e6f1d615e5..a33efd04ed2f0dc61d889062221e8138fa9ae0b1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1125,6 +1125,9 @@ public class PurpurWorldConfig {
-     public double phantomSpawnLocalDifficultyChance = 3.0D;
-     public int phantomSpawnMinPerAttempt = 1;
-     public int phantomSpawnMaxPerAttempt = -1;
-+    public int phantomBurnInLight = 0;
-+    public boolean phantomIgnorePlayersWithTorch = false;
-+    public boolean phantomBurnInDaylight = true;
-     private void phantomSettings() {
-         phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
-         phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -1155,6 +1158,9 @@ public class PurpurWorldConfig {
-         phantomSpawnLocalDifficultyChance = getDouble("mobs.phantom.spawn.local-difficulty-chance", phantomSpawnLocalDifficultyChance);
-         phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
-         phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);
-+        phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
-+        phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
-+        phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
-     }
- 
-     public boolean pigRidable = false;
--- a/patches/todo/server/0078-Configurable-villager-breeding.patch
+++ b/patches/todo/server/0078-Configurable-villager-breeding.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: draycia <lonelyyordle@gmail.com>
-Date: Tue, 31 Mar 2020 23:48:55 -0700
-Subject: [PATCH] Configurable villager breeding
-
-
-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 979bbbf4229a9355b31913454cb565fc98049911..aa95cd7e04e25dec63c172d219f1f16cd6c9c4b5 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -780,7 +780,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
- 
-     @Override
-     public boolean canBreed() {
-        return this.foodLevel + this.countFoodPointsInInventory() >= 12 && !this.isSleeping() && this.getAge() == 0;
-+        return this.level.purpurConfig.villagerCanBreed && this.foodLevel + this.countFoodPointsInInventory() >= 12 && !this.isSleeping() && this.getAge() == 0; // Purpur
-     }
- 
-     private boolean hungry() {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a33efd04ed2f0dc61d889062221e8138fa9ae0b1..c50c47c88bdf1bf1c613172970e346f81e18d142 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1613,6 +1613,7 @@ public class PurpurWorldConfig {
-     public double villagerMaxHealth = 20.0D;
-     public boolean villagerFollowEmeraldBlock = false;
-     public boolean villagerCanBeLeashed = false;
-+    public boolean villagerCanBreed = true;
-     private void villagerSettings() {
-         villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
-         villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1625,6 +1626,7 @@ public class PurpurWorldConfig {
-         villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
-         villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
-         villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
-+        villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
-     }
- 
-     public boolean vindicatorRidable = false;
--- a/patches/todo/server/0079-Redstone-deactivates-spawners.patch
+++ b/patches/todo/server/0079-Redstone-deactivates-spawners.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: draycia <lonelyyordle@gmail.com>
-Date: Tue, 14 Apr 2020 00:35:12 -0700
-Subject: [PATCH] Redstone deactivates spawners
-
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 31ac0e5ca26c7bdfa9b710d0bb78d846ddf6863e..feb65fc9ee04141fe6f77400660442ed207547a1 100644
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -55,6 +55,7 @@ public abstract class BaseSpawner {
-     }
- 
-     public boolean isNearPlayer(Level world, BlockPos pos) {
-+        if (world.purpurConfig.spawnerDeactivateByRedstone && world.hasNeighborSignal(pos)) return false; // Purpur
-         return world.hasNearbyAlivePlayerThatAffectsSpawning((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper - Affects Spawning API
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c50c47c88bdf1bf1c613172970e346f81e18d142..4e2f77ca0587ea3328e958c5a0583d4abec6221c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -363,6 +363,11 @@ public class PurpurWorldConfig {
-         signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
-     }
- 
-+    public boolean spawnerDeactivateByRedstone = false;
-+    private void spawnerSettings() {
-+        spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
-+    }
-+
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
--- a/patches/todo/server/0080-Totems-work-in-inventory.patch
+++ b/patches/todo/server/0080-Totems-work-in-inventory.patch
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: draycia <lonelyyordle@gmail.com>
-Date: Wed, 29 Apr 2020 00:45:58 -0700
-Subject: [PATCH] Totems work in inventory
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 587a88a0c4954cba28fbdb31228ec81f2ba59b82..f7e95a73f60d06a102f79677bb0e31bf9532894d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1551,6 +1551,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 }
-             }
- 
-+            // Purpur start
-+            if (level.purpurConfig.totemOfUndyingWorksInInventory && this instanceof ServerPlayer player && (itemstack == null || itemstack.getItem() != Items.TOTEM_OF_UNDYING) && player.getBukkitEntity().hasPermission("purpur.inventory_totem")) {
-+                for (ItemStack item : player.getInventory().items) {
-+                    if (item.getItem() == Items.TOTEM_OF_UNDYING) {
-+                        itemstack1 = item;
-+                        itemstack = item.copy();
-+                        break;
-+                    }
-+                }
-+            }
-+            // Purpur end
-+
-             org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
-             EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
-             event.setCancelled(itemstack == null);
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4e2f77ca0587ea3328e958c5a0583d4abec6221c..af181872d94ae506bb17589bc7b6d6f511dcefe2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -247,6 +247,7 @@ public class PurpurWorldConfig {
-     public String playerDeathExpDropEquation = "expLevel * 7";
-     public int playerDeathExpDropMax = 100;
-     public boolean teleportIfOutsideBorder = false;
-+    public boolean totemOfUndyingWorksInInventory = false;
-     private void playerSettings() {
-         if (PurpurConfig.version < 19) {
-             boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -263,6 +264,7 @@ public class PurpurWorldConfig {
-         playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
-         playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
-         teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
-+        totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
-     }
- 
-     public boolean silkTouchEnabled = false;
--- a/patches/todo/server/0081-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/todo/server/0081-Add-vindicator-johnny-spawn-chance.patch
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 24 Jul 2020 19:38:21 -0500
-Subject: [PATCH] Add vindicator johnny spawn chance
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index 0a4f7125c38d3138ec8eedec4ca72000f25ba6ac..29039b35c60c7c6370c6593a53b8aa2a3db0a368 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -154,6 +154,12 @@ public class Vindicator extends AbstractIllager {
-         RandomSource randomSource = world.getRandom();
-         this.populateDefaultEquipmentSlots(randomSource, difficulty);
-         this.populateDefaultEquipmentEnchantments(randomSource, difficulty);
-+        // Purpur start
-+        Level level = world.getMinecraftWorld();
-+        if (level.purpurConfig.vindicatorJohnnySpawnChance > 0D && random.nextDouble() <= level.purpurConfig.vindicatorJohnnySpawnChance) {
-+            setCustomName(Component.translatable("Johnny"));
-+        }
-+        // Purpur end
-         return spawnGroupData;
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index af181872d94ae506bb17589bc7b6d6f511dcefe2..fc5c24f00639dd5d9bfd05c5ba768b4129598944 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1640,6 +1640,7 @@ public class PurpurWorldConfig {
-     public boolean vindicatorRidableInWater = true;
-     public boolean vindicatorControllable = true;
-     public double vindicatorMaxHealth = 24.0D;
-+    public double vindicatorJohnnySpawnChance = 0D;
-     private void vindicatorSettings() {
-         vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
-         vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
-@@ -1650,6 +1651,7 @@ public class PurpurWorldConfig {
-             set("mobs.vindicator.attributes.max_health", oldValue);
-         }
-         vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
-+        vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
-     }
- 
-     public boolean wanderingTraderRidable = false;
--- a/patches/todo/server/0082-Add-option-to-disable-certain-block-updates.patch
+++ b/patches/todo/server/0082-Add-option-to-disable-certain-block-updates.patch
@@ -1,146 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 4 Aug 2020 17:11:58 -0500
-Subject: [PATCH] Add option to disable certain block updates
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java b/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java
-index a6c25647fb37f59307de0d390f8e8cf55504d7d3..52aae8bd4023b2bb48f12983f54b20fa3c95d403 100644
--- a/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java
-@@ -21,6 +21,7 @@ public class ChorusPlantBlock extends PipeBlock {
- 
-     @Override
-     public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-+        if (org.purpurmc.purpur.PurpurConfig.disableChorusPlantUpdates) return this.defaultBlockState(); // Purpur
-         return this.getStateForPlacement(ctx.getLevel(), ctx.getClickedPos());
-     }
- 
-@@ -36,6 +37,7 @@ public class ChorusPlantBlock extends PipeBlock {
- 
-     @Override
-     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
-+        if (org.purpurmc.purpur.PurpurConfig.disableChorusPlantUpdates) return state; // Purpur
-         if (!state.canSurvive(world, pos)) {
-             world.scheduleTick(pos, this, 1);
-             return super.updateShape(state, direction, neighborState, world, pos, neighborPos);
-diff --git a/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java b/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java
-index 3c6d97b51c6fec130b80e5965afa2c49d48843c9..b456cb8efd8f0be8a6860c82462ce9bdde3a8383 100644
--- a/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java
-@@ -22,29 +22,65 @@ public class HugeMushroomBlock extends Block {
- 
-     public HugeMushroomBlock(BlockBehaviour.Properties settings) {
-         super(settings);
-        this.registerDefaultState(this.stateDefinition.any().setValue(NORTH, Boolean.valueOf(true)).setValue(EAST, Boolean.valueOf(true)).setValue(SOUTH, Boolean.valueOf(true)).setValue(WEST, Boolean.valueOf(true)).setValue(UP, Boolean.valueOf(true)).setValue(DOWN, Boolean.valueOf(true)));
-+        // Purpur start
-+        this.registerDefaultState(this.stateDefinition.any()
-+                .setValue(NORTH, true)
-+                .setValue(EAST, true)
-+                .setValue(SOUTH, true)
-+                .setValue(WEST, true)
-+                .setValue(UP, true)
-+                .setValue(DOWN, true));
-+        // Purpur end
-     }
- 
-     @Override
-     public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-+        if (org.purpurmc.purpur.PurpurConfig.disableMushroomBlockUpdates) return this.defaultBlockState(); // Purpur
-         BlockGetter blockGetter = ctx.getLevel();
-         BlockPos blockPos = ctx.getClickedPos();
-        return this.defaultBlockState().setValue(DOWN, Boolean.valueOf(!blockGetter.getBlockState(blockPos.below()).is(this))).setValue(UP, Boolean.valueOf(!blockGetter.getBlockState(blockPos.above()).is(this))).setValue(NORTH, Boolean.valueOf(!blockGetter.getBlockState(blockPos.north()).is(this))).setValue(EAST, Boolean.valueOf(!blockGetter.getBlockState(blockPos.east()).is(this))).setValue(SOUTH, Boolean.valueOf(!blockGetter.getBlockState(blockPos.south()).is(this))).setValue(WEST, Boolean.valueOf(!blockGetter.getBlockState(blockPos.west()).is(this)));
-+        // Purpur start
-+        return this.defaultBlockState()
-+                .setValue(DOWN, this != blockGetter.getBlockStateIfLoaded(blockPos.below()).getBlock())
-+                .setValue(UP, this != blockGetter.getBlockStateIfLoaded(blockPos.above()).getBlock())
-+                .setValue(NORTH, this != blockGetter.getBlockStateIfLoaded(blockPos.north()).getBlock())
-+                .setValue(EAST, this != blockGetter.getBlockStateIfLoaded(blockPos.east()).getBlock())
-+                .setValue(SOUTH, this != blockGetter.getBlockStateIfLoaded(blockPos.south()).getBlock())
-+                .setValue(WEST, this != blockGetter.getBlockStateIfLoaded(blockPos.west()).getBlock());
-+        // Purpur end
-     }
- 
-     @Override
-     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
-+        if (org.purpurmc.purpur.PurpurConfig.disableMushroomBlockUpdates) return state; // Purpur
-         return neighborState.is(this) ? state.setValue(PROPERTY_BY_DIRECTION.get(direction), Boolean.valueOf(false)) : super.updateShape(state, direction, neighborState, world, pos, neighborPos);
-     }
- 
-     @Override
-     public BlockState rotate(BlockState state, Rotation rotation) {
-        return state.setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.NORTH)), state.getValue(NORTH)).setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.SOUTH)), state.getValue(SOUTH)).setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.EAST)), state.getValue(EAST)).setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.WEST)), state.getValue(WEST)).setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.UP)), state.getValue(UP)).setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.DOWN)), state.getValue(DOWN));
-+        // Purpur start
-+        if (org.purpurmc.purpur.PurpurConfig.disableMushroomBlockUpdates) return state;
-+        return state
-+                .setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.NORTH)), state.getValue(NORTH))
-+                .setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.SOUTH)), state.getValue(SOUTH))
-+                .setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.EAST)), state.getValue(EAST))
-+                .setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.WEST)), state.getValue(NORTH))
-+                .setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.UP)), state.getValue(UP))
-+                .setValue(PROPERTY_BY_DIRECTION.get(rotation.rotate(Direction.DOWN)), state.getValue(DOWN));
-+        // Purpur end
-     }
- 
-     @Override
-     public BlockState mirror(BlockState state, Mirror mirror) {
-        return state.setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.NORTH)), state.getValue(NORTH)).setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.SOUTH)), state.getValue(SOUTH)).setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.EAST)), state.getValue(EAST)).setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.WEST)), state.getValue(WEST)).setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.UP)), state.getValue(UP)).setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.DOWN)), state.getValue(DOWN));
-+        // Purpur start
-+        if (org.purpurmc.purpur.PurpurConfig.disableMushroomBlockUpdates) return state;
-+        return state
-+                .setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.NORTH)), state.getValue(NORTH))
-+                .setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.SOUTH)), state.getValue(SOUTH))
-+                .setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.EAST)), state.getValue(EAST))
-+                .setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.WEST)), state.getValue(NORTH))
-+                .setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.UP)), state.getValue(UP))
-+                .setValue(PROPERTY_BY_DIRECTION.get(mirror.mirror(Direction.DOWN)), state.getValue(DOWN));
-+        // Purpur end
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-index a9c2d254bda5686a35ad2393534b85030dd8b136..58deb2a688833151fa96941e81ae81046cf3c18a 100644
--- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-@@ -62,11 +62,13 @@ public class NoteBlock extends Block {
- 
-     @Override
-     public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-+        if (org.purpurmc.purpur.PurpurConfig.disableNoteBlockUpdates) return this.defaultBlockState(); // Purpur
-         return this.setInstrument(ctx.getLevel(), ctx.getClickedPos(), this.defaultBlockState());
-     }
- 
-     @Override
-     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
-+        if (org.purpurmc.purpur.PurpurConfig.disableNoteBlockUpdates) return state; // Purpur
-         boolean flag = NoteBlock.isFeatureFlagEnabled(world) ? direction.getAxis() == Direction.Axis.Y : direction == Direction.DOWN;
- 
-         return flag ? this.setInstrument(world, pos, state) : super.updateShape(state, direction, neighborState, world, pos, neighborPos);
-@@ -82,6 +84,7 @@ public class NoteBlock extends Block {
-                 state = world.getBlockState(pos); // CraftBukkit - SPIGOT-5617: update in case changed in event
-             }
- 
-+            if (!org.purpurmc.purpur.PurpurConfig.disableNoteBlockUpdates) // Purpur
-             world.setBlock(pos, (BlockState) state.setValue(NoteBlock.POWERED, flag1), 3);
-         }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8575753af39d19e485f915e3e12e377c325b4751..e829e215d1fe80cdaf9162268011912081f4c5ee 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -249,6 +249,15 @@ public class PurpurConfig {
-         allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
-     }
- 
-+    public static boolean disableMushroomBlockUpdates = false;
-+    public static boolean disableNoteBlockUpdates = false;
-+    public static boolean disableChorusPlantUpdates = false;
-+    private static void blockUpdatesSettings() {
-+        disableMushroomBlockUpdates = getBoolean("settings.blocks.disable-mushroom-updates", disableMushroomBlockUpdates);
-+        disableNoteBlockUpdates = getBoolean("settings.blocks.disable-note-block-updates", disableNoteBlockUpdates);
-+        disableChorusPlantUpdates = getBoolean("settings.blocks.disable-chorus-plant-updates", disableChorusPlantUpdates);
-+    }
-+
-     public static boolean loggerSuppressInitLegacyMaterialError = false;
-     public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
-     public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
--- a/patches/todo/server/0083-Dispensers-place-anvils-option.patch
+++ b/patches/todo/server/0083-Dispensers-place-anvils-option.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 4 Aug 2020 21:11:03 -0500
-Subject: [PATCH] Dispensers place anvils option
-
-
-diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 88d18d18d69876c98e199acb647c6cca9448d55d..da9cc93f560269a00f0093ad76aba3a05eedb046 100644
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-@@ -52,6 +52,7 @@ import net.minecraft.world.item.SpawnEggItem;
- import net.minecraft.world.item.alchemy.PotionUtils;
- import net.minecraft.world.item.alchemy.Potions;
- import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.block.AnvilBlock;
- import net.minecraft.world.level.block.BaseFireBlock;
- import net.minecraft.world.level.block.BeehiveBlock;
- import net.minecraft.world.level.block.Block;
-@@ -1168,6 +1169,23 @@ public interface DispenseItemBehavior {
-                 }
-             }
-         });
-+        // Purpur start
-+        DispenserBlock.registerBehavior(Items.ANVIL, (new OptionalDispenseItemBehavior() {
-+            @Override
-+            public ItemStack execute(BlockSource dispenser, ItemStack stack) {
-+                Level level = dispenser.getLevel();
-+                if (!level.purpurConfig.dispenserPlaceAnvils) return super.execute(dispenser, stack);
-+                Direction facing = dispenser.getBlockState().getValue(DispenserBlock.FACING);
-+                BlockPos pos = dispenser.getPos().relative(facing);
-+                BlockState state = level.getBlockState(pos);
-+                if (state.isAir()) {
-+                    level.setBlockAndUpdate(pos, Blocks.ANVIL.defaultBlockState().setValue(AnvilBlock.FACING, facing.getAxis() == Direction.Axis.Y ? Direction.NORTH : facing.getClockWise()));
-+                    stack.shrink(1);
-+                }
-+                return stack;
-+            }
-+        }));
-+        // Purpur end
-     }
- 
-     static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fc5c24f00639dd5d9bfd05c5ba768b4129598944..9f40c3ec5c3d87f8090c25317148231a22064795 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -321,8 +321,10 @@ public class PurpurWorldConfig {
-     }
- 
-     public boolean dispenserApplyCursedArmor = true;
-+    public boolean dispenserPlaceAnvils = false;
-     private void dispenserSettings() {
-         dispenserApplyCursedArmor = getBoolean("blocks.dispenser.apply-cursed-to-armor-slots", dispenserApplyCursedArmor);
-+        dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
-     }
- 
-     public boolean farmlandGetsMoistFromBelow = false;
--- a/patches/todo/server/0084-Allow-anvil-colors.patch
+++ b/patches/todo/server/0084-Allow-anvil-colors.patch
@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 4 Aug 2020 22:08:23 -0500
-Subject: [PATCH] Allow anvil colors
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index 8475a8514b39d543cc7cf0dbfef6d2aabb6127d0..2281dba58d32b6314a7abcdb103c03c7056c24e9 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-@@ -296,6 +296,54 @@ public class AnvilMenu extends ItemCombinerMenu {
-             } else if (!this.itemName.equals(itemstack.getHoverName().getString())) {
-                 b1 = 1;
-                 i += b1;
-+                // Purpur start
-+                if (this.player != null) {
-+                    org.bukkit.craftbukkit.entity.CraftHumanEntity player = this.player.getBukkitEntity();
-+                    String name = this.itemName;
-+                    boolean removeItalics = false;
-+                    if (player.hasPermission("purpur.anvil.remove_italics")) {
-+                        if (name.startsWith("&r")) {
-+                            name = name.substring(2);
-+                            removeItalics = true;
-+                        } else if (name.startsWith("<r>")) {
-+                            name = name.substring(3);
-+                            removeItalics = true;
-+                        } else if (name.startsWith("<reset>")) {
-+                            name = name.substring(7);
-+                            removeItalics = true;
-+                        }
-+                    }
-+                    if (this.player.level.purpurConfig.anvilAllowColors) {
-+                        if (player.hasPermission("purpur.anvil.color")) {
-+                            java.util.regex.Matcher matcher = java.util.regex.Pattern.compile("(?i)&([0-9a-fr])").matcher(name);
-+                            while (matcher.find()) {
-+                                String match = matcher.group(1);
-+                                name = name.replace("&" + match, "\u00a7" + match.toLowerCase(java.util.Locale.ROOT));
-+                            }
-+                            //name = name.replaceAll("(?i)&([0-9a-fr])", "\u00a7$1");
-+                        }
-+                        if (player.hasPermission("purpur.anvil.format")) {
-+                            java.util.regex.Matcher matcher = java.util.regex.Pattern.compile("(?i)&([k-or])").matcher(name);
-+                            while (matcher.find()) {
-+                                String match = matcher.group(1);
-+                                name = name.replace("&" + match, "\u00a7" + match.toLowerCase(java.util.Locale.ROOT));
-+                            }
-+                            //name = name.replaceAll("(?i)&([l-or])", "\u00a7$1");
-+                        }
-+                    }
-+                    net.kyori.adventure.text.Component component;
-+                    if (this.player.level.purpurConfig.anvilColorsUseMiniMessage && player.hasPermission("purpur.anvil.minimessage")) {
-+                        component = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.bukkit.ChatColor.stripColor(name));
-+                    } else {
-+                        component = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(name);
-+                    }
-+                    if (removeItalics) {
-+                        component = component.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
-+                    }
-+                    itemstack1.setHoverName(io.papermc.paper.adventure.PaperAdventure.asVanilla(component));
-+                }
-+                else
-+                // Purpur end
-                 itemstack1.setHoverName(Component.literal(this.itemName));
-             }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9f40c3ec5c3d87f8090c25317148231a22064795..c5c975f4ebc04f12e40f2e1c9a8ca5aa37ec141a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -299,6 +299,13 @@ public class PurpurWorldConfig {
-         });
-     }
- 
-+    public boolean anvilAllowColors = false;
-+    public boolean anvilColorsUseMiniMessage;
-+    private void anvilSettings() {
-+        anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
-+        anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
-+    }
-+
-     public boolean bedExplode = true;
-     public double bedExplosionPower = 5.0D;
-     public boolean bedExplosionFire = true;
--- a/patches/todo/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/todo/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 8 Aug 2020 16:11:51 -0500
-Subject: [PATCH] Add option to disable dolphin treasure searching
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 0accc5595461ce92259e3f819a9837aabd442d77..3b65375703732966d0fcbbb68ba0805edd26bfd8 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -481,6 +481,7 @@ public class Dolphin extends WaterAnimal {
- 
-         @Override
-         public boolean canUse() {
-+            if (this.dolphin.level.purpurConfig.dolphinDisableTreasureSearching) return false; // Purpur
-             return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100 && this.dolphin.level.getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false
-         }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c5c975f4ebc04f12e40f2e1c9a8ca5aa37ec141a..fa07216c52848c957871a8884e844d6534aa6c66 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -612,6 +612,7 @@ public class PurpurWorldConfig {
-     public float dolphinSpitSpeed = 1.0F;
-     public float dolphinSpitDamage = 2.0F;
-     public double dolphinMaxHealth = 10.0D;
-+    public boolean dolphinDisableTreasureSearching = false;
-     private void dolphinSettings() {
-         dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
-         dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
-@@ -624,6 +625,7 @@ public class PurpurWorldConfig {
-             set("mobs.dolphin.attributes.max_health", oldValue);
-         }
-         dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
-+        dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
-     }
- 
-     public boolean donkeyRidableInWater = false;
--- a/patches/todo/server/0086-Short-enderman-height.patch
+++ b/patches/todo/server/0086-Short-enderman-height.patch
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 10 Aug 2020 21:46:22 -0500
-Subject: [PATCH] Short enderman height
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 944ccfacd740ea0cdd0b8ffbd75bd2e561ebad9b..314a2a31079fcb7619ff9ebef8e6cf161f5c7c9c 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -308,7 +308,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-     private Component description;
-     @Nullable
-     private ResourceLocation lootTable;
-    private final EntityDimensions dimensions;
-+    private EntityDimensions dimensions; // Purpur - remove final
-+    public void setDimensions(EntityDimensions dimensions) { this.dimensions = dimensions; } // Purpur
-     private final FeatureFlagSet requiredFeatures;
- 
-     private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
-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 b24d890fb9a85434d612c57b4a8763652565d017..d8123aa5585cb4c0cc1210ced04fdf08f731fdb2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -429,6 +429,7 @@ public class EnderMan extends Monster implements NeutralMob {
-         if (this.isInvulnerableTo(source)) {
-             return false;
-         } else if (getRider() != null && this.isControllable()) { return super.hurt(source, amount); // Purpur - no teleporting on damage
-+        } else if (org.purpurmc.purpur.PurpurConfig.endermanShortHeight && source.is(net.minecraft.world.damagesource.DamageTypes.IN_WALL)) { return false; // Purpur - no suffocation damage if short height
-         } else {
-             boolean flag = source.getDirectEntity() instanceof ThrownPotion;
-             boolean flag1;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e829e215d1fe80cdaf9162268011912081f4c5ee..db4c85cae58805cfa2a460e33a13e85abc8e593d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -244,6 +244,12 @@ public class PurpurConfig {
-         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
-     }
- 
-+    public static boolean endermanShortHeight = false;
-+    private static void entitySettings() {
-+        endermanShortHeight = getBoolean("settings.entity.enderman.short-height", endermanShortHeight);
-+        if (endermanShortHeight) EntityType.ENDERMAN.setDimensions(EntityDimensions.scalable(0.6F, 1.9F));
-+    }
-+
-     public static boolean allowWaterPlacementInTheEnd = true;
-     private static void allowWaterPlacementInEnd() {
-         allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
--- a/patches/todo/server/0087-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/todo/server/0087-Stop-squids-floating-on-top-of-water.patch
@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 13 Aug 2020 04:00:26 -0500
-Subject: [PATCH] Stop squids floating on top of water
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7260fc2adc222a6fc5c64ba9ba01ee91051accb8..22656eea7e7d6b5e1f749db2f2209e5b8c362490 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4226,6 +4226,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         this.yRotO = this.getYRot();
-     }
- 
-+    // Purpur start
-+    public AABB getAxisForFluidCheck() {
-+        return this.getBoundingBox().deflate(0.001D);
-+    }
-+    // Purpur end
-+
-     public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
-         if (false && this.touchingUnloadedChunk()) { // Pufferfish - cost of a lookup here is the same cost as below, so skip
-             return false;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 0c2b930a0fc5e32afd12a4850acaaa7eb732fc01..de1bf4aea2661763948aba01d93e7685f3ef73cb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -75,6 +75,12 @@ public class Squid extends WaterAnimal {
-     public void initAttributes() {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.squidMaxHealth);
-     }
-+
-+    @Override
-+    public net.minecraft.world.phys.AABB getAxisForFluidCheck() {
-+        // Stops squids from floating just over the water
-+        return super.getAxisForFluidCheck().offsetY(level.purpurConfig.squidOffsetWaterCheck);
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/phys/AABB.java b/src/main/java/net/minecraft/world/phys/AABB.java
-index ffc76354ead6937daf366c3d87bcb51d3e4c47f5..5b98d42b5d6bc07265fbb017e51a6281c148436a 100644
--- a/src/main/java/net/minecraft/world/phys/AABB.java
-+++ b/src/main/java/net/minecraft/world/phys/AABB.java
-@@ -374,4 +374,10 @@ public class AABB {
-     public static AABB ofSize(Vec3 center, double dx, double dy, double dz) {
-         return new AABB(center.x - dx / 2.0D, center.y - dy / 2.0D, center.z - dz / 2.0D, center.x + dx / 2.0D, center.y + dy / 2.0D, center.z + dz / 2.0D);
-     }
-+
-+    // Purpur - tuinity added method
-+    public final AABB offsetY(double dy) {
-+        return new AABB(this.minX, this.minY + dy, this.minZ, this.maxX, this.maxY + dy, this.maxZ);
-+    }
-+    // Purpur
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fa07216c52848c957871a8884e844d6534aa6c66..1d53cf3ff8a7695e609e236e091f5e7259700678 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1480,6 +1480,7 @@ public class PurpurWorldConfig {
-     public boolean squidControllable = true;
-     public double squidMaxHealth = 10.0D;
-     public boolean squidImmuneToEAR = true;
-+    public double squidOffsetWaterCheck = 0.0D;
-     private void squidSettings() {
-         squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
-         squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1490,6 +1491,7 @@ public class PurpurWorldConfig {
-         }
-         squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
-         squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
-+        squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
-     }
- 
-     public boolean spiderRidable = false;
--- a/patches/todo/server/0088-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/todo/server/0088-Crying-obsidian-valid-for-portal-frames.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 17 Aug 2020 17:34:33 -0500
-Subject: [PATCH] Crying obsidian valid for portal frames
-
-
-diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-index c461e0d04047db9c0c5ecc04063cebd38bf96ec2..e7554ec800f321e4e34c926c53f2375a8c3aa979 100644
--- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-@@ -34,7 +34,7 @@ public class PortalShape {
-     private static final int MIN_HEIGHT = 3;
-     public static final int MAX_HEIGHT = 21;
-     private static final BlockBehaviour.StatePredicate FRAME = (iblockdata, iblockaccess, blockposition) -> {
-        return iblockdata.is(Blocks.OBSIDIAN);
-+        return iblockdata.is(Blocks.OBSIDIAN) || (org.purpurmc.purpur.PurpurConfig.cryingObsidianValidForPortalFrame && iblockdata.is(Blocks.CRYING_OBSIDIAN)); // Purpur
-     };
-     private static final float SAFE_TRAVEL_MAX_ENTITY_XY = 4.0F;
-     private static final double SAFE_TRAVEL_MAX_VERTICAL_DELTA = 1.0D;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index db4c85cae58805cfa2a460e33a13e85abc8e593d..ba4dc732327e7661d39929dfa330a5b29cce9269 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -212,6 +212,7 @@ public class PurpurConfig {
-     public static int barrelRows = 3;
-     public static boolean enderChestSixRows = false;
-     public static boolean enderChestPermissionRows = false;
-+    public static boolean cryingObsidianValidForPortalFrame = false;
-     private static void blockSettings() {
-         if (version < 3) {
-             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -242,6 +243,7 @@ public class PurpurConfig {
-         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);
-+        cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
-     }
- 
-     public static boolean endermanShortHeight = false;
--- a/patches/todo/server/0089-Entities-can-use-portals-configuration.patch
+++ b/patches/todo/server/0089-Entities-can-use-portals-configuration.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 17 Aug 2020 19:32:05 -0500
-Subject: [PATCH] Entities can use portals configuration
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 22656eea7e7d6b5e1f749db2f2209e5b8c362490..d1d2c0ea830fc3e4b5ac1be59a70fd551ad8c9b3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2942,7 +2942,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public void handleInsidePortal(BlockPos pos) {
-         if (this.isOnPortalCooldown()) {
-             this.setPortalCooldown();
-        } else {
-+        } else if (level.purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer) { // Purpur
-             if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
-                 this.portalEntrancePos = pos.immutable();
-             }
-@@ -3634,7 +3634,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
- 
-     public boolean canChangeDimensions() {
-        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid; // Paper
-+        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid && (level.purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer); // Paper // Purpur
-     }
- 
-     public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1d53cf3ff8a7695e609e236e091f5e7259700678..8be52e5cd16bcfae3b714cd8ec865e5036a3e631 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -100,6 +100,7 @@ public class PurpurWorldConfig {
-     public boolean useBetterMending = false;
-     public boolean boatEjectPlayersOnLand = false;
-     public boolean disableDropsOnCrammingDeath = false;
-+    public boolean entitiesCanUsePortals = true;
-     public boolean milkCuresBadOmen = true;
-     public double tridentLoyaltyVoidReturnHeight = 0.0D;
-     public double voidDamageHeight = -64.0D;
-@@ -108,6 +109,7 @@ public class PurpurWorldConfig {
-         useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
-         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-         disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
-+        entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
-         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
-         tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
-         voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
--- a/patches/todo/server/0090-LivingEntity-broadcastItemBreak.patch
+++ b/patches/todo/server/0090-LivingEntity-broadcastItemBreak.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 17 Aug 2020 21:50:39 -0500
-Subject: [PATCH] LivingEntity#broadcastItemBreak
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6dfb577d1b6451d5a6c9231ad57e4aef7976edfc..6216b4590f40b6d5f904d57b50076fb8f64fd7a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1082,5 +1082,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void setSafeFallDistance(float safeFallDistance) {
-         getHandle().safeFallDistance = safeFallDistance;
-     }
-+
-+    @Override
-+    public void broadcastItemBreak(org.bukkit.inventory.EquipmentSlot slot) {
-+        if (slot == null) return;
-+        getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
-+    }
-     // Purpur end
- }
--- a/patches/todo/server/0091-Customizable-wither-health-and-healing.patch
+++ b/patches/todo/server/0091-Customizable-wither-health-and-healing.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Thu, 20 Aug 2020 17:38:12 -0700
-Subject: [PATCH] Customizable wither health and healing
-
-Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 864ebffb6c903acb9de5594029838b927eea4318..b22d0af2267581467af9a4d0e8104146b3da9b71 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -529,8 +529,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-                 }
-             }
- 
-            if (this.tickCount % 20 == 0) {
-                this.heal(1.0F, EntityRegainHealthEvent.RegainReason.REGEN); // CraftBukkit
-+            // Purpur start - customizable heal rate and amount
-+            if (this.tickCount % level.purpurConfig.witherHealthRegenDelay == 0) {
-+                this.heal(level.purpurConfig.witherHealthRegenAmount, EntityRegainHealthEvent.RegainReason.REGEN); // CraftBukkit
-+                // Purpur end
-             }
- 
-             this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8be52e5cd16bcfae3b714cd8ec865e5036a3e631..307f03cc8af263f851d7d6054337b4de84a9f7d4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1719,6 +1719,8 @@ public class PurpurWorldConfig {
-     public boolean witherControllable = true;
-     public double witherMaxY = 320D;
-     public double witherMaxHealth = 300.0D;
-+    public float witherHealthRegenAmount = 1.0f;
-+    public int witherHealthRegenDelay = 20;
-     private void witherSettings() {
-         witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
-         witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1734,6 +1736,8 @@ public class PurpurWorldConfig {
-             set("mobs.wither.attributes.max_health", oldValue);
-         }
-         witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
-+        witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
-+        witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
-     }
- 
-     public boolean witherSkeletonRidable = false;
--- a/patches/todo/server/0092-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/todo/server/0092-Allow-toggling-special-MobSpawners-per-world.patch
@@ -1,99 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Sat, 22 Aug 2020 20:47:11 -0700
-Subject: [PATCH] Allow toggling special MobSpawners per world
-
-In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 575be84b580f7d7f4968bc4e2a69e0a067a3a617..9807f610aca29d6882bb5314a30161727dfe7c34 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -543,7 +543,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         this.dragonParts = new Int2ObjectOpenHashMap();
-         this.tickTime = flag1;
-         this.server = minecraftserver;
-        this.customSpawners = list;
-+        // Purpur start - enable/disable MobSpawners per world
-+        this.customSpawners = Lists.newArrayList();
-+        if (purpurConfig.phantomSpawning) {
-+            customSpawners.add(new net.minecraft.world.level.levelgen.PhantomSpawner());
-+        }
-+        if (purpurConfig.patrolSpawning) {
-+            customSpawners.add(new net.minecraft.world.level.levelgen.PatrolSpawner());
-+        }
-+        if (purpurConfig.catSpawning) {
-+            customSpawners.add(new net.minecraft.world.entity.npc.CatSpawner());
-+        }
-+        if (purpurConfig.villageSiegeSpawning) {
-+            customSpawners.add(new net.minecraft.world.entity.ai.village.VillageSiege());
-+        }
-+        if (purpurConfig.villagerTraderSpawning) {
-+            customSpawners.add(new net.minecraft.world.entity.npc.WanderingTraderSpawner(iworlddataserver));
-+        }
-+        // Purpur end
-         this.serverLevelData = iworlddataserver;
-         ChunkGenerator chunkgenerator = worlddimension.generator();
-         // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index 5d199fe497bd852827d3d18fb7566a09e70331a3..6cd8a50289a6404441e9e5e08d82d2ebe14a09cc 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -159,7 +159,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
-             int k = pos.getX() + this.random.nextInt(range * 2) - range;
-             int l = pos.getZ() + this.random.nextInt(range * 2) - range;
-             int i1 = world.getHeight(Heightmap.Types.WORLD_SURFACE, k, l);
-            BlockPos blockposition2 = new BlockPos(k, i1, l);
-+            // Purpur start - allow traders to spawn below nether roof
-+            BlockPos.MutableBlockPos blockposition2 = new BlockPos.MutableBlockPos(k, i1, l);
-+            if (world.dimensionType().hasCeiling()) {
-+                do {
-+                    blockposition2.relative(net.minecraft.core.Direction.DOWN);
-+                } while (!world.getBlockState(blockposition2).isAir());
-+                do {
-+                    blockposition2.relative(net.minecraft.core.Direction.DOWN);
-+                } while (world.getBlockState(blockposition2).isAir() && blockposition2.getY() > 0);
-+            }
-+            // Purpur end
- 
-             if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
-                 blockposition1 = blockposition2;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 307f03cc8af263f851d7d6054337b4de84a9f7d4..ead2c290915b247fa5a430bfff6d2adac9af6119 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -71,6 +71,12 @@ public class PurpurWorldConfig {
-         return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
-     }
- 
-+    private boolean getBoolean(String path, Predicate<Boolean> predicate) {
-+        String val = getString(path, "default").toLowerCase();
-+        Boolean bool = BooleanUtils.toBooleanObject(val, "true", "false", "default");
-+        return predicate.test(bool);
-+    }
-+
-     private double getDouble(String path, double def) {
-         PurpurConfig.config.addDefault("world-settings.default." + path, def);
-         return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
-@@ -239,6 +245,21 @@ public class PurpurWorldConfig {
-         }
-     }
- 
-+    public boolean catSpawning;
-+    public boolean patrolSpawning;
-+    public boolean phantomSpawning;
-+    public boolean villagerTraderSpawning;
-+    public boolean villageSiegeSpawning;
-+    private void mobSpawnerSettings() {
-+        // values of "default" or null will default to true only if the world environment is normal (aka overworld)
-+        Predicate<Boolean> predicate = (bool) -> (bool != null && bool) || (bool == null && environment == World.Environment.NORMAL);
-+        catSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-cats", predicate);
-+        patrolSpawning = getBoolean("gameplay-mechanics.mob-spawning.raid-patrols", predicate);
-+        phantomSpawning = getBoolean("gameplay-mechanics.mob-spawning.phantoms", predicate);
-+        villagerTraderSpawning = getBoolean("gameplay-mechanics.mob-spawning.wandering-traders", predicate);
-+        villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
-+    }
-+
-     public boolean idleTimeoutKick = true;
-     public boolean idleTimeoutTickNearbyEntities = true;
-     public boolean idleTimeoutCountAsSleeping = false;
--- a/patches/todo/server/0093-Raid-cooldown-setting.patch
+++ b/patches/todo/server/0093-Raid-cooldown-setting.patch
@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Thu, 27 Aug 2020 13:48:52 -0700
-Subject: [PATCH] Raid cooldown setting
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java
-index fabce3bc592b1b172b227395a07febdbb66ec3c9..df48bcc8f329e3855bb7426bdfe0e3c72af53bea 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raids.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raids.java
-@@ -28,6 +28,7 @@ import net.minecraft.world.phys.Vec3;
- public class Raids extends SavedData {
- 
-     private static final String RAID_FILE_ID = "raids";
-+    public final Map<java.util.UUID, Integer> playerCooldowns = Maps.newHashMap();
-     public final Map<Integer, Raid> raidMap = Maps.newHashMap();
-     private final ServerLevel level;
-     private int nextAvailableID;
-@@ -45,6 +46,17 @@ public class Raids extends SavedData {
- 
-     public void tick() {
-         ++this.tick;
-+        // Purpur start
-+        if (level.purpurConfig.raidCooldownSeconds != 0 && this.tick % 20 == 0) {
-+            com.google.common.collect.ImmutableMap.copyOf(playerCooldowns).forEach((uuid, i) -> {
-+                if (i < 1) {
-+                    playerCooldowns.remove(uuid);
-+                } else {
-+                    playerCooldowns.put(uuid, i - 1);
-+                }
-+            });
-+        }
-+        // Purpur end
-         Iterator iterator = this.raidMap.values().iterator();
- 
-         while (iterator.hasNext()) {
-@@ -129,11 +141,13 @@ public class Raids extends SavedData {
-                 }
- 
-                 if (flag) {
-+                    if (level.purpurConfig.raidCooldownSeconds != 0 && playerCooldowns.containsKey(player.getUUID())) return null; // Purpur
-                     // CraftBukkit start
-                     if (!org.bukkit.craftbukkit.event.CraftEventFactory.callRaidTriggerEvent(raid, player)) {
-                         player.removeEffect(MobEffects.BAD_OMEN);
-                         return null;
-                     }
-+                    if (level.purpurConfig.raidCooldownSeconds != 0) playerCooldowns.put(player.getUUID(), level.purpurConfig.raidCooldownSeconds); // Purpur
- 
-                     if (!this.raidMap.containsKey(raid.getId())) {
-                         this.raidMap.put(raid.getId(), raid);
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ead2c290915b247fa5a430bfff6d2adac9af6119..d62f275ab355b1ff559f7a770b4c5c428b46e008 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -111,6 +111,7 @@ public class PurpurWorldConfig {
-     public double tridentLoyaltyVoidReturnHeight = 0.0D;
-     public double voidDamageHeight = -64.0D;
-     public double voidDamageDealt = 4.0D;
-+    public int raidCooldownSeconds = 0;
-     private void miscGameplayMechanicsSettings() {
-         useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
-         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -120,6 +121,7 @@ public class PurpurWorldConfig {
-         tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
-         voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
-         voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
-+        raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
-     }
- 
-     public int elytraDamagePerSecond = 1;
--- a/patches/todo/server/0094-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/todo/server/0094-Despawn-rate-config-options-per-projectile-type.patch
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Mon, 14 Sep 2020 10:09:05 -0700
-Subject: [PATCH] Despawn rate config options per projectile type
-
-This patch's implementation has been removed in favor of Pufferfish's entity-timeouts.
-The config remains for migration purposes.
-
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d62f275ab355b1ff559f7a770b4c5c428b46e008..bc326cb023feae60e1341939550de549ca6365bd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -292,6 +292,39 @@ public class PurpurWorldConfig {
-         totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
-     }
- 
-+    private static boolean projectileDespawnRateSettingsMigrated = false;
-+    private void projectileDespawnRateSettings() {
-+        if (PurpurConfig.version < 28 && !projectileDespawnRateSettingsMigrated) {
-+            migrateProjectileDespawnRateSettings(EntityType.DRAGON_FIREBALL);
-+            migrateProjectileDespawnRateSettings(EntityType.EGG);
-+            migrateProjectileDespawnRateSettings(EntityType.ENDER_PEARL);
-+            migrateProjectileDespawnRateSettings(EntityType.EXPERIENCE_BOTTLE);
-+            migrateProjectileDespawnRateSettings(EntityType.FIREWORK_ROCKET);
-+            migrateProjectileDespawnRateSettings(EntityType.FISHING_BOBBER);
-+            migrateProjectileDespawnRateSettings(EntityType.FIREBALL);
-+            migrateProjectileDespawnRateSettings(EntityType.LLAMA_SPIT);
-+            migrateProjectileDespawnRateSettings(EntityType.POTION);
-+            migrateProjectileDespawnRateSettings(EntityType.SHULKER_BULLET);
-+            migrateProjectileDespawnRateSettings(EntityType.SMALL_FIREBALL);
-+            migrateProjectileDespawnRateSettings(EntityType.SNOWBALL);
-+            migrateProjectileDespawnRateSettings(EntityType.WITHER_SKULL);
-+            //PufferfishConfig.save();
-+            set("gameplay-mechanics.projectile-despawn-rates", null);
-+            // pufferfish's entity_timeout is a global config
-+            // we only want to migrate values from the
-+            // default world (first world loaded)
-+            projectileDespawnRateSettingsMigrated = true;
-+        }
-+    }
-+    private void migrateProjectileDespawnRateSettings(EntityType<?> type) {
-+        //String pufferName = "entity_timeouts." + type.id.toUpperCase(Locale.ROOT);
-+        //int value = getInt("gameplay-mechanics.projectile-despawn-rates." + type.id, -1);
-+        //if (value != -1 && PufferfishConfig.getRawInt(pufferName, -1) == -1) {
-+        //    PufferfishConfig.setInt(pufferName, value);
-+        //    type.ttl = value;
-+        //}
-+    }
-+
-     public boolean silkTouchEnabled = false;
-     public String silkTouchSpawnerName = "<reset><white>Monster Spawner";
-     public List<String> silkTouchSpawnerLore = new ArrayList<>();
--- a/patches/todo/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/todo/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: nitricspace <nitricspace@users.noreply.github.com>
-Date: Mon, 21 Sep 2020 23:19:43 +0100
-Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
- when lagging
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index a08c00b8c0488d18be5e182f7892e5ab71d12247..338f693d098b6ab507c30f6411c9a952c34ba8e3 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -136,6 +136,10 @@ public class MobGoalHelper {
-     static {
-         // TODO these kinda should be checked on each release, in case obfuscation changes
-         deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
-+        // Purpur start
-+        deobfuscationMap.put("zombie_1", "zombie_attack_villager");
-+        deobfuscationMap.put("drowned_1", "drowned_attack_villager");
-+        // Purpur end
- 
-         ignored.add("goal_selector_1");
-         ignored.add("goal_selector_2");
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 863fd15039e53405aac66d769598a38ac2586115..794c2fb3400e08c2dda24d29024dad7686a378fa 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -120,7 +120,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
-         this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0D));
-         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Drowned.class})).setAlertOthers(ZombifiedPiglin.class));
-         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::okTarget));
-        if (this.level.spigotConfig.zombieAggressiveTowardsVillager) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)); // Paper
-+        // Purpur start
-+        if ( level.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<AbstractVillager>(this, AbstractVillager.class, false) { // Spigot
-+            @Override
-+            public boolean canUse() {
-+                return (level.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !level.getServer().server.isLagging()) && super.canUse();
-+            }
-+
-+            @Override
-+            public boolean canContinueToUse() {
-+                return (level.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !level.getServer().server.isLagging()) && super.canContinueToUse();
-+            }
-+        });
-+        // Purpur end
-         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
-         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Axolotl.class, true, false));
-         this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index fb41431f25081c8ca0cf03dc5128f78f589e4e26..ebeeb8c31d05a0ad2e291599a0b6ebe179b8cf82 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -156,7 +156,19 @@ public class Zombie extends Monster {
-         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(ZombifiedPiglin.class));
-         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
-        if ( level.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)); // Spigot
-+        // Purpur start
-+        if ( level.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<AbstractVillager>(this, AbstractVillager.class, false) { // Spigot
-+            @Override
-+            public boolean canUse() {
-+                return (level.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !level.getServer().server.isLagging()) && super.canUse();
-+            }
-+
-+            @Override
-+            public boolean canContinueToUse() {
-+                return (level.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !level.getServer().server.isLagging()) && super.canContinueToUse();
-+            }
-+        });
-+        // Purpur end
-         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
-         this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
-     }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bc326cb023feae60e1341939550de549ca6365bd..d5d83c8a79cca8d8216b24c7116c7c475924d104 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1852,6 +1852,7 @@ public class PurpurWorldConfig {
-     public boolean zombieJockeyOnlyBaby = true;
-     public double zombieJockeyChance = 0.05D;
-     public boolean zombieJockeyTryExistingChickens = true;
-+    public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-     private void zombieSettings() {
-         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
-         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1866,6 +1867,7 @@ public class PurpurWorldConfig {
-         zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
-         zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
-         zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
-+        zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
-     }
- 
-     public boolean zombieHorseRidableInWater = false;
--- a/patches/todo/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/todo/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 3 Oct 2020 17:40:52 -0500
-Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
-
-
-diff --git a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
-index 8d4aca59bd7518179520f4d4fb7137778e232d90..dbc3040bc087a6016a491caf76019663c1cd1b4c 100644
--- a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
-@@ -39,6 +39,7 @@ public final class Ingredient implements Predicate<ItemStack> {
-     @Nullable
-     private IntList stackingIds;
-     public boolean exact; // CraftBukkit
-+    public Predicate<org.bukkit.inventory.ItemStack> predicate;
- 
-     public Ingredient(Stream<? extends Ingredient.Value> entries) {
-         this.values = (Ingredient.Value[]) entries.toArray((i) -> {
-@@ -64,6 +65,12 @@ public final class Ingredient implements Predicate<ItemStack> {
-         } else if (this.isEmpty()) {
-             return itemstack.isEmpty();
-         } else {
-+            // Purpur start
-+            if (predicate != null) {
-+                return predicate.test(itemstack.asBukkitCopy());
-+            }
-+            // Purpur end
-+
-             ItemStack[] aitemstack = this.getItems();
-             int i = aitemstack.length;
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-index 8563fcf77eef0e1e354857b9a4256d78a523a8d0..b94c964790433cb7bd88ad16c5d82d1a8e39312d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-@@ -29,6 +29,7 @@ public interface CraftRecipe extends Recipe {
-         } else if (bukkit instanceof RecipeChoice.ExactChoice) {
-             stack = new Ingredient(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> new net.minecraft.world.item.crafting.Ingredient.ItemValue(CraftItemStack.asNMSCopy(mat))));
-             stack.exact = true;
-+            stack.predicate = ((RecipeChoice.ExactChoice) bukkit).getPredicate(); // Purpur
-         } else {
-             throw new IllegalArgumentException("Unknown recipe stack instance " + bukkit);
-         }
--- a/patches/todo/server/0097-Flying-squids-Oh-my.patch
+++ b/patches/todo/server/0097-Flying-squids-Oh-my.patch
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 4 Oct 2020 12:00:42 -0500
-Subject: [PATCH] Flying squids! Oh my!
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index b86329a18dc83073462049da975dd71b9d637ab2..b0581379619a1ac510b1973512f70db0e961a1f3 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
-+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-@@ -39,6 +39,11 @@ public class GlowSquid extends Squid {
-     public void initAttributes() {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.glowSquidMaxHealth);
-     }
-+
-+    @Override
-+    public boolean canFly() {
-+        return this.level.purpurConfig.glowSquidsCanFly;
-+    }
-     // Purpur end
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index de1bf4aea2661763948aba01d93e7685f3ef73cb..c396874d24ae535b4c07649e303e60b7ab158811 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -81,6 +81,15 @@ public class Squid extends WaterAnimal {
-         // Stops squids from floating just over the water
-         return super.getAxisForFluidCheck().offsetY(level.purpurConfig.squidOffsetWaterCheck);
-     }
-+
-+    public boolean canFly() {
-+        return this.level.purpurConfig.squidsCanFly;
-+    }
-+
-+    @Override
-+    public boolean isInWater() {
-+        return this.wasTouchingWater || canFly();
-+    }
-     // Purpur end
- 
-     @Override
-@@ -155,6 +164,7 @@ public class Squid extends WaterAnimal {
-         }
- 
-         if (this.isInWaterOrBubble()) {
-+            if (canFly()) setNoGravity(!wasTouchingWater); // Purpur
-             if (this.tentacleMovement < 3.1415927F) {
-                 float f = this.tentacleMovement / 3.1415927F;
- 
-@@ -314,7 +324,7 @@ public class Squid extends WaterAnimal {
- 
-             if (i > 100) {
-                 this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
-            } else if (this.squid.getRandom().nextInt(reducedTickDelay(50)) == 0 || !this.squid.wasTouchingWater || !this.squid.hasMovementVector()) {
-+            } else if (this.squid.getRandom().nextInt(reducedTickDelay(50)) == 0 || !this.squid.isInWater() || !this.squid.hasMovementVector()) { // Purpur
-                 float f = this.squid.getRandom().nextFloat() * 6.2831855F;
-                 float f1 = Mth.cos(f) * 0.2F;
-                 float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d5d83c8a79cca8d8216b24c7116c7c475924d104..18baed72b56398846a76229bbc46638125cb82f8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -904,10 +904,12 @@ public class PurpurWorldConfig {
-     public boolean glowSquidRidable = false;
-     public boolean glowSquidControllable = true;
-     public double glowSquidMaxHealth = 10.0D;
-+    public boolean glowSquidsCanFly = false;
-     private void glowSquidSettings() {
-         glowSquidRidable = getBoolean("mobs.glow_squid.ridable", glowSquidRidable);
-         glowSquidControllable = getBoolean("mobs.glow_squid.controllable", glowSquidControllable);
-         glowSquidMaxHealth = getDouble("mobs.glow_squid.attributes.max_health", glowSquidMaxHealth);
-+        glowSquidsCanFly = getBoolean("mobs.glow_squid.can-fly", glowSquidsCanFly);
-     }
- 
-     public boolean goatRidable = false;
-@@ -1539,6 +1541,7 @@ public class PurpurWorldConfig {
-     public double squidMaxHealth = 10.0D;
-     public boolean squidImmuneToEAR = true;
-     public double squidOffsetWaterCheck = 0.0D;
-+    public boolean squidsCanFly = false;
-     private void squidSettings() {
-         squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
-         squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1550,6 +1553,7 @@ public class PurpurWorldConfig {
-         squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
-         squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
-         squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
-+        squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
-     }
- 
-     public boolean spiderRidable = false;
--- a/patches/todo/server/0098-Infinity-bow-settings.patch
+++ b/patches/todo/server/0098-Infinity-bow-settings.patch
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 4 Oct 2020 19:08:53 -0500
-Subject: [PATCH] Infinity bow settings
-
-
-diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
-index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c8ebe6366 100644
--- a/src/main/java/net/minecraft/world/item/BowItem.java
-+++ b/src/main/java/net/minecraft/world/item/BowItem.java
-@@ -38,7 +38,7 @@ public class BowItem extends ProjectileWeaponItem implements Vanishable {
-                 float f = BowItem.getPowerForTime(j);
- 
-                 if ((double) f >= 0.1D) {
-                    boolean flag1 = flag && itemstack1.is(Items.ARROW);
-+                    boolean flag1 = flag && ((itemstack1.is(Items.ARROW) && world.purpurConfig.infinityWorksWithNormalArrows) || (itemstack1.is(Items.TIPPED_ARROW) && world.purpurConfig.infinityWorksWithTippedArrows) || (itemstack1.is(Items.SPECTRAL_ARROW) && world.purpurConfig.infinityWorksWithSpectralArrows)); // Purpur                    if (!world.isClientSide) {
- 
-                     if (!world.isClientSide) {
-                         ArrowItem itemarrow = (ArrowItem) (itemstack1.getItem() instanceof ArrowItem ? itemstack1.getItem() : Items.ARROW);
-@@ -132,7 +132,7 @@ public class BowItem extends ProjectileWeaponItem implements Vanishable {
-         ItemStack itemstack = user.getItemInHand(hand);
-         boolean flag = !user.getProjectile(itemstack).isEmpty();
- 
-        if (!user.getAbilities().instabuild && !flag) {
-+        if (!(world.purpurConfig.infinityWorksWithoutArrows && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, itemstack) > 0) && !user.getAbilities().instabuild && !flag) { // Purpur
-             return InteractionResultHolder.fail(itemstack);
-         } else {
-             user.startUsingItem(hand);
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 18baed72b56398846a76229bbc46638125cb82f8..7b212f784be68e737197a3a16b4cdee1c45e42a6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -142,6 +142,17 @@ public class PurpurWorldConfig {
-         entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan);
-     }
- 
-+    public boolean infinityWorksWithoutArrows = false;
-+    public boolean infinityWorksWithNormalArrows = true;
-+    public boolean infinityWorksWithSpectralArrows = false;
-+    public boolean infinityWorksWithTippedArrows = false;
-+    private void infinityArrowsSettings() {
-+        infinityWorksWithoutArrows = getBoolean("gameplay-mechanics.infinity-bow.works-without-arrows", infinityWorksWithoutArrows);
-+        infinityWorksWithNormalArrows = getBoolean("gameplay-mechanics.infinity-bow.normal-arrows", infinityWorksWithNormalArrows);
-+        infinityWorksWithSpectralArrows = getBoolean("gameplay-mechanics.infinity-bow.spectral-arrows", infinityWorksWithSpectralArrows);
-+        infinityWorksWithTippedArrows = getBoolean("gameplay-mechanics.infinity-bow.tipped-arrows", infinityWorksWithTippedArrows);
-+    }
-+
-     public List<Item> itemImmuneToCactus = new ArrayList<>();
-     public List<Item> itemImmuneToExplosion = new ArrayList<>();
-     public List<Item> itemImmuneToFire = new ArrayList<>();
--- a/patches/todo/server/0099-Configurable-daylight-cycle.patch
+++ b/patches/todo/server/0099-Configurable-daylight-cycle.patch
@@ -1,107 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 10 Oct 2020 14:29:55 -0500
-Subject: [PATCH] Configurable daylight cycle
-
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaaec05a2791 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-@@ -5,7 +5,7 @@ import net.minecraft.network.protocol.Packet;
- 
- public class ClientboundSetTimePacket implements Packet<ClientGamePacketListener> {
-     private final long gameTime;
-    private final long dayTime;
-+    private long dayTime; public void setDayTime(long dayTime) { this.dayTime = dayTime; } // Purpur
- 
-     public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
-         this.gameTime = time;
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 65ba915d3644b638ce3b5314c0aed5b2018f67e0..52487bc86a28a2f2c1c677b07c9fec77685f2af0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1522,7 +1522,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             long worldTime = world.getGameTime();
-             final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
-             for (Player entityhuman : world.players()) {
-                if (!(entityhuman instanceof ServerPlayer) || (tickCount + entityhuman.getId()) % 20 != 0) {
-+                if (!(entityhuman instanceof ServerPlayer) || (!world.isForceTime() && (tickCount + entityhuman.getId()) % 20 != 0)) { // Purpur
-                     continue;
-                 }
-                 ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9807f610aca29d6882bb5314a30161727dfe7c34..e113e0e15ec88ac3b72f20ec2c88c3302e77ce20 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -212,6 +212,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     private final StructureManager structureManager;
-     private final StructureCheck structureCheck;
-     private final boolean tickTime;
-+    private double preciseTime; // Purpur
-+    private boolean forceTime; // Purpur
-     public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
- 
-     // CraftBukkit start
-@@ -623,6 +625,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-         this.chunkTaskScheduler = new io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler(this, io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.workerThreads); // Paper - rewrite chunk system
-         this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
-+        this.preciseTime = this.serverLevelData.getDayTime(); // Purpur
-     }
- 
-     public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
-@@ -792,6 +795,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             this.serverLevelData.setGameTime(i);
-             this.serverLevelData.getScheduledEvents().tick(this.server, i);
-             if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
-+                // Purpur start
-+                int incrementTicks = isDay() ? this.purpurConfig.daytimeTicks : this.purpurConfig.nighttimeTicks;
-+                if (incrementTicks != 12000) {
-+                    this.preciseTime += 12000 / (double) incrementTicks;
-+                    this.setDayTime(this.preciseTime);
-+                } else
-+                // Purpur end
-                 this.setDayTime(this.levelData.getDayTime() + 1L);
-             }
- 
-@@ -800,7 +810,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-     public void setDayTime(long timeOfDay) {
-         this.serverLevelData.setDayTime(timeOfDay);
-+        // Purpur start
-+        this.preciseTime = timeOfDay;
-+        this.forceTime = false;
-     }
-+    public void setDayTime(double i) {
-+        this.serverLevelData.setDayTime((long) i);
-+        this.forceTime = true;
-+        // Purpur end
-+    }
-+
-+    // Purpur start
-+    public boolean isForceTime() {
-+        return this.forceTime;
-+    }
-+    // Purpur end
- 
-     public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
-         Iterator iterator = this.customSpawners.iterator();
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7b212f784be68e737197a3a16b4cdee1c45e42a6..3f0f7264aef8942d82f8d12ccf9bc48c72104ab5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -124,6 +124,13 @@ public class PurpurWorldConfig {
-         raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
-     }
- 
-+    public int daytimeTicks = 12000;
-+    public int nighttimeTicks = 12000;
-+    private void daytimeCycleSettings() {
-+        daytimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.daytime", daytimeTicks);
-+        nighttimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.nighttime", nighttimeTicks);
-+    }
-+
-     public int elytraDamagePerSecond = 1;
-     public double elytraDamageMultiplyBySpeed = 0;
-     public boolean elytraIgnoreUnbreaking = false;
--- a/patches/todo/server/0100-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/todo/server/0100-Allow-infinite-and-mending-enchantments-together.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 13 Oct 2020 20:04:33 -0500
-Subject: [PATCH] Allow infinite and mending enchantments together
-
-
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java b/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-index 518d85a13c37a2f7d32ca0718323181048559986..2c4ce164ab3011f372ff1719c8d4a3331d8db55f 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-@@ -19,6 +19,6 @@ public class ArrowInfiniteEnchantment extends Enchantment {
- 
-     @Override
-     public boolean checkCompatibility(Enchantment other) {
-        return other instanceof MendingEnchantment ? false : super.checkCompatibility(other);
-+        return other instanceof MendingEnchantment ? org.purpurmc.purpur.PurpurConfig.allowInfinityMending : super.checkCompatibility(other);
-     }
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ba4dc732327e7661d39929dfa330a5b29cce9269..4e303fc793bef67426308204d704b02960fc75b8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -246,6 +246,16 @@ public class PurpurConfig {
-         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
-     }
- 
-+    public static boolean allowInfinityMending = false;
-+    private static void enchantmentSettings() {
-+        if (version < 5) {
-+            boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-+            set("settings.enchantment.allow-infinity-and-mending-together", oldValue);
-+            set("settings.enchantment.allow-infinite-and-mending-together", null);
-+        }
-+        allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
-+    }
-+
-     public static boolean endermanShortHeight = false;
-     private static void entitySettings() {
-         endermanShortHeight = getBoolean("settings.entity.enderman.short-height", endermanShortHeight);