Start of the configurable base attributes

current-paper

@@ -1 +1 @@
-1.16.4--3489b4ed8e37a9805e25679a998065df8b249622
+1.16.4--b294b7890a3a5b0285fd69dd2695acc73c9a74d5

patches/server/0003-Purpur-config-files.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 03c95b30d8..3b9b44851c 100644
+index 03c95b30d..3b9b44851 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -585,7 +585,7 @@ public class Metrics {
@@ -29,7 +29,7 @@ index 03c95b30d8..3b9b44851c 100644
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6ab0a51b42..e21ef1bdc6 100644
+index 6ab0a51b4..e21ef1bdc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -118,6 +118,11 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 6ab0a51b42..e21ef1bdc6 100644
              config.save(CONFIG_FILE);
          } catch (IOException ex) {
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fcba187bbd..c1eb8e8679 100644
+index fcba187bb..c1eb8e867 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -167,6 +167,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -65,7 +65,7 @@ index fcba187bbd..c1eb8e8679 100644
          // Paper end
          com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 0388d1099f..3c20a4e1c4 100644
+index 9b35c8ad9..2c4c13b30 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -166,7 +166,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -78,7 +78,7 @@ index 0388d1099f..3c20a4e1c4 100644
          if (this.bF) {
              this.bF = false;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 59abca0fd2..ca4d260e8f 100644
+index 59abca0fd..ca4d260e8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -102,7 +102,7 @@ index 59abca0fd2..ca4d260e8f 100644
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000..0dbd665043
+index 000000000..b807f8aa8
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,130 @@
@@ -161,8 +161,8 @@ index 0000000000..0dbd665043
 +        commands = new HashMap<>();
 +        commands.put("purpur", new PurpurCommand("purpur"));
 +
-+        version = getInt("config-version", 7);
-+        set("config-version", 7);
++        version = getInt("config-version", 8);
++        set("config-version", 8);
 +
 +        readConfig(PurpurConfig.class, null);
 +    }
@@ -238,7 +238,7 @@ index 0000000000..0dbd665043
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000..361f7857e4
+index 000000000..361f7857e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -0,0 +1,59 @@
@@ -303,7 +303,7 @@ index 0000000000..361f7857e4
 +}
 diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 new file mode 100644
-index 0000000000..4904be939c
+index 000000000..4904be939
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 @@ -0,0 +1,65 @@
@@ -373,7 +373,7 @@ index 0000000000..4904be939c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 991a799148..53ed0465a9 100644
+index 991a79914..53ed0465a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -857,6 +857,7 @@ public final class CraftServer implements Server {
@@ -420,7 +420,7 @@ index 991a799148..53ed0465a9 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d2ec9f7f10..b3c0ba202d 100644
+index d2ec9f7f1..b3c0ba202 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,14 @@ public class Main {

patches/server/0028-Giants-AI-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings
 
 
 diff --git a/src/main/java/net/minecraft/server/AttributeMapBase.java b/src/main/java/net/minecraft/server/AttributeMapBase.java
-index c57e23e16b..92aa104dc5 100644
+index c57e23e16..92aa104dc 100644
 --- a/src/main/java/net/minecraft/server/AttributeMapBase.java
 +++ b/src/main/java/net/minecraft/server/AttributeMapBase.java
 @@ -41,6 +41,7 @@ public class AttributeMapBase {
@@ -17,7 +17,7 @@ index c57e23e16b..92aa104dc5 100644
      public AttributeModifiable a(AttributeBase attributebase) {
          return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8fdfec3b8e..c90a767c78 100644
+index 8fdfec3b8..c90a767c7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -30,10 +30,10 @@ index 8fdfec3b8e..c90a767c78 100644
      public float I;
      protected final Random random;
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index 9f4f56c47e..8dce2aad77 100644
+index 9f4f56c47..cf899bb6a 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-@@ -4,9 +4,68 @@ public class EntityGiantZombie extends EntityMonster {
+@@ -4,9 +4,69 @@ public class EntityGiantZombie extends EntityMonster {
  
      public EntityGiantZombie(EntityTypes<? extends EntityGiantZombie> entitytypes, World world) {
          super(entitytypes, world);
@@ -70,6 +70,7 @@ index 9f4f56c47e..8dce2aad77 100644
 +            getAttributeMap().getAttribute(GenericAttributes.MAX_HEALTH).setValue(world.purpurConfig.giantMaxHealth);
 +            getAttributeMap().getAttribute(GenericAttributes.MOVEMENT_SPEED).setValue(world.purpurConfig.giantMovementSpeed);
 +            getAttributeMap().getAttribute(GenericAttributes.ATTACK_DAMAGE).setValue(world.purpurConfig.giantAttackDamage);
++            setHealth(getMaxHealth());
 +        }
 +    }
 +
@@ -103,7 +104,7 @@ index 9f4f56c47e..8dce2aad77 100644
      @Override
      protected float b(EntityPose entitypose, EntitySize entitysize) {
          return 10.440001F;
-@@ -18,6 +77,6 @@ public class EntityGiantZombie extends EntityMonster {
+@@ -18,6 +78,6 @@ public class EntityGiantZombie extends EntityMonster {
  
      @Override
      public float a(BlockPosition blockposition, IWorldReader iworldreader) {
@@ -112,7 +113,7 @@ index 9f4f56c47e..8dce2aad77 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7b32a1fb79..b281ca841b 100644
+index 7b32a1fb7..b281ca841 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -948,6 +948,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -146,7 +147,7 @@ index 7b32a1fb79..b281ca841b 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 21b5b7d2c4..bc88db73b7 100644
+index 21b5b7d2c..bc88db73b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2159,7 +2159,7 @@ public abstract class EntityLiving extends Entity {
@@ -159,28 +160,33 @@ index 21b5b7d2c4..bc88db73b7 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f403f9dc6c..f5004f221e 100644
+index f403f9dc6..3207b8b61 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -113,6 +113,23 @@ public class PurpurWorldConfig {
+@@ -113,6 +113,28 @@ public class PurpurWorldConfig {
          turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
      }
  
 +    public float giantStepHeight = 2.0F;
 +    public float giantJumpHeight = 1.0F;
-+    public double giantMaxHealth = 100.0D;
 +    public double giantMovementSpeed = 0.5D;
 +    public double giantAttackDamage = 50.0D;
 +    public boolean giantHaveAI = false;
 +    public boolean giantHaveHostileAI = false;
++    public double giantMaxHealth = 100.0D;
 +    private void giantSettings() {
 +        giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight);
 +        giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
-+        giantMaxHealth = getDouble("mobs.giant.max-health", giantMaxHealth);
 +        giantMovementSpeed = getDouble("mobs.giant.movement-speed", giantMovementSpeed);
 +        giantAttackDamage = getDouble("mobs.giant.attack-damage", giantAttackDamage);
 +        giantHaveAI = getBoolean("mobs.giant.have-ai", giantHaveAI);
 +        giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
++        if (PurpurConfig.version < 8) {
++            double oldValue = getDouble("mobs.giant.max-health", giantMaxHealth);
++            set("mobs.giant.attributes.max-health", oldValue);
++            set("mobs.giant.max-health", null);
++        }
++        giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
 +    }
 +
      public int villagerBrainTicks = 1;

patches/server/0029-Illusioners-AI-settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Illusioners AI settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 50442b3a49..b6c6b4d54e 100644
+index 50442b3a4..a9dcf6875 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-@@ -19,6 +19,17 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
+@@ -19,6 +19,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
  
      }
  
@@ -19,6 +19,7 @@ index 50442b3a49..b6c6b4d54e 100644
 +            getAttributeMap().getAttribute(GenericAttributes.MOVEMENT_SPEED).setValue(world.purpurConfig.illusionerMovementSpeed);
 +            getAttributeMap().getAttribute(GenericAttributes.FOLLOW_RANGE).setValue(world.purpurConfig.illusionerFollowRange);
 +            getAttributeMap().getAttribute(GenericAttributes.MAX_HEALTH).setValue(world.purpurConfig.illusionerMaxHealth);
++            setHealth(getMaxHealth());
 +        }
 +    }
 +    // Purpur end
@@ -27,20 +28,25 @@ index 50442b3a49..b6c6b4d54e 100644
      protected void initPathfinder() {
          super.initPathfinder();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f5004f221e..0073e3b85a 100644
+index 3207b8b61..5c716a6b4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -130,6 +130,15 @@ public class PurpurWorldConfig {
-         giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
+@@ -135,6 +135,20 @@ public class PurpurWorldConfig {
+         giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
      }
  
-+    public double illusionerMaxHealth = 32.0D;
 +    public double illusionerMovementSpeed = 0.5D;
 +    public double illusionerFollowRange = 18.0D;
++    public double illusionerMaxHealth = 32.0D;
 +    private void illusionerSettings() {
-+        illusionerMaxHealth = getDouble("mobs.illusioner.max-health", illusionerMaxHealth);
 +        illusionerMovementSpeed = getDouble("mobs.illusioner.movement-speed", illusionerMovementSpeed);
 +        illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
++        if (PurpurConfig.version < 8) {
++            double oldValue = getDouble("mobs.illusioner.max-health", illusionerMaxHealth);
++            set("mobs.illusioner.attributes.max-health", oldValue);
++            set("mobs.illusioner.max-health", null);
++        }
++        illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth);
 +    }
 +
      public int villagerBrainTicks = 1;

patches/server/0030-Zombie-horse-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 63b6a06737..c7a43dccee 100644
+index 63b6a0673..c7a43dcce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1049,12 +1049,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -34,10 +34,10 @@ index 63b6a06737..c7a43dccee 100644
  
                  EntityLightning entitylightning = (EntityLightning) EntityTypes.LIGHTNING_BOLT.a((World) this);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0073e3b85a..b652bfbdc3 100644
+index 5c716a6b4..04dfb8200 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -145,4 +145,9 @@ public class PurpurWorldConfig {
+@@ -155,4 +155,9 @@ public class PurpurWorldConfig {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
      }

patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 80a4a71753..25a9b7906b 100644
+index 80a4a7175..25a9b7906 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -297,6 +297,10 @@ public class EntityRabbit extends EntityAnimal {
@@ -37,11 +37,11 @@ index 80a4a71753..25a9b7906b 100644
          int i = this.random.nextInt(100);
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a1c0dc687a..fe82dc392b 100644
+index 5b8961a06..f51f60110 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -144,6 +144,13 @@ public class PurpurWorldConfig {
-         illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
+@@ -154,6 +154,13 @@ public class PurpurWorldConfig {
+         illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth);
      }
  
 +    public double rabbitNaturalToast = 0.0D;

patches/server/0034-Make-Iron-Golems-Swim.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make Iron Golems Swim
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 0a5c27e732..bdff236883 100644
+index 0a5c27e73..bdff23688 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -24,6 +24,7 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable {
@@ -17,11 +17,11 @@ index 0a5c27e732..bdff236883 100644
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
          this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D, false));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fe82dc392b..fd552adb95 100644
+index f51f60110..3ec33a963 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -144,6 +144,11 @@ public class PurpurWorldConfig {
-         illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
+@@ -154,6 +154,11 @@ public class PurpurWorldConfig {
+         illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth);
      }
  
 +    public boolean ironGolemCanSwim = false;

patches/server/0037-Breedable-Polar-Bears.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Breedable Polar Bears
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 914c6e48d6..99f0bd8f82 100644
+index 914c6e48d..99f0bd8f8 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -23,6 +23,30 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
@@ -75,10 +75,10 @@ index 914c6e48d6..99f0bd8f82 100644
          this.datawatcher.set(EntityPolarBear.bo, flag);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 40bc4cc77b..882ac4c1f6 100644
+index 459ff8ffe..09b66b9ca 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -154,6 +154,14 @@ public class PurpurWorldConfig {
+@@ -164,6 +164,14 @@ public class PurpurWorldConfig {
          ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
      }
  

patches/server/0044-Pigs-give-saddle-back.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Pigs give saddle back
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index ee94c2827c..7f52c39234 100644
+index ee94c2827..7f52c3923 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -109,6 +109,18 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
@@ -28,10 +28,10 @@ index ee94c2827c..7f52c39234 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d8bd7ffd5f..7d6c624ac2 100644
+index 0c841b824..24ef91788 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -178,6 +178,11 @@ public class PurpurWorldConfig {
+@@ -188,6 +188,11 @@ public class PurpurWorldConfig {
          ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
      }
  

patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 48997367a6..95ee716fc9 100644
+index 48997367a..95ee716fc 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -43,10 +43,10 @@ index 48997367a6..95ee716fc9 100644
              return EnumInteractionResult.PASS;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7d6c624ac2..c91f007044 100644
+index 24ef91788..6d93ff4b0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -198,6 +198,13 @@ public class PurpurWorldConfig {
+@@ -208,6 +208,13 @@ public class PurpurWorldConfig {
          rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
      }
  

patches/server/0060-Add-wither-skeleton-takes-wither-damage-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add wither skeleton takes wither damage option
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 1ae9910fef..c872be77a6 100644
+index 1ae9910fe..c872be77a 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -97,6 +97,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -17,10 +17,10 @@ index 1ae9910fef..c872be77a6 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 11af56df60..79a87a1a16 100644
+index c60a3d7d9..0db9da068 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -271,6 +271,11 @@ public class PurpurWorldConfig {
+@@ -281,6 +281,11 @@ public class PurpurWorldConfig {
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
      }
  

patches/server/0065-Villagers-farming-can-bypass-mob-griefing-gamerule.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java
-index 54a555509e..0ff202c0d7 100644
+index 54a555509..0ff202c0d 100644
 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java
 +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java
 @@ -18,7 +18,7 @@ public class BehaviorFarm extends Behavior<EntityVillager> {
@@ -18,10 +18,10 @@ index 54a555509e..0ff202c0d7 100644
          } else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) {
              return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ef7ca798ab..e31094bd17 100644
+index 8677230d4..79109fd94 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -277,9 +277,11 @@ public class PurpurWorldConfig {
+@@ -287,9 +287,11 @@ public class PurpurWorldConfig {
  
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;

patches/server/0066-Villagers-follow-emerald-blocks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers follow emerald blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a02f54ab3a..3c222a6a30 100644
+index 171e8553a..0ab7d3441 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -74,6 +74,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -23,7 +23,7 @@ index a02f54ab3a..3c222a6a30 100644
      public BehaviorController<EntityVillager> getBehaviorController() {
          return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index 1fddf7c774..488a6891d8 100644
+index 1fddf7c77..488a6891d 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 @@ -14,6 +14,8 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -36,7 +36,7 @@ index 1fddf7c774..488a6891d8 100644
      private CraftMerchant craftMerchant;
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index f1a509063c..74c2d89af5 100644
+index f1a509063..74c2d89af 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -40,6 +40,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -48,10 +48,10 @@ index f1a509063c..74c2d89af5 100644
          this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
          this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e31094bd17..2c334ecb60 100644
+index 79109fd94..7b3df3fa4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -278,10 +278,17 @@ public class PurpurWorldConfig {
+@@ -288,10 +288,17 @@ public class PurpurWorldConfig {
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFarmingBypassMobGriefing = false;

patches/server/0067-Allow-leashing-villagers.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index b71dea314c..84ac5112a2 100644
+index 23d5d1f0a..23eb697f3 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1145,6 +1145,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1147,6 +1147,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (!this.isAlive()) {
              return EnumInteractionResult.PASS;
          } else if (this.getLeashHolder() == entityhuman) {
@@ -17,7 +17,7 @@ index b71dea314c..84ac5112a2 100644
              if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
                  ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 3c222a6a30..563dfc3daa 100644
+index 0ab7d3441..3c457c896 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -79,6 +79,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -33,7 +33,7 @@ index 3c222a6a30..563dfc3daa 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 74c2d89af5..96dda6a14f 100644
+index 74c2d89af..96dda6a14 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -47,6 +47,13 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -51,10 +51,10 @@ index 74c2d89af5..96dda6a14f 100644
      @Override
      public EntityAgeable createChild(WorldServer worldserver, EntityAgeable entityageable) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2c334ecb60..0ca84d650e 100644
+index 7b3df3fa4..585e4aef1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -277,17 +277,21 @@ public class PurpurWorldConfig {
+@@ -287,17 +287,21 @@ public class PurpurWorldConfig {
  
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;

patches/server/0068-Implement-configurable-search-radius-for-villagers-t.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 563dfc3daa..33b7bc39fb 100644
+index 3c457c896..894089d66 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -894,6 +894,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -18,10 +18,10 @@ index 563dfc3daa..33b7bc39fb 100644
  
          for (int i = 0; i < 10; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0ca84d650e..13fc46d441 100644
+index 585e4aef1..db6fb004b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -280,12 +280,16 @@ public class PurpurWorldConfig {
+@@ -290,12 +290,16 @@ public class PurpurWorldConfig {
      public boolean villagerCanBeLeashed = false;
      public boolean villagerFarmingBypassMobGriefing = false;
      public boolean villagerFollowEmeraldBlock = false;

patches/server/0084-Configurable-jockey-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable jockey options
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 9ae0897bfd..1a10281692 100644
+index 9ae0897bf..1a1028169 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -21,6 +21,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -33,7 +33,7 @@ index 9ae0897bfd..1a10281692 100644
      protected void m() {
          this.goalSelector.a(1, new EntityDrowned.c(this, 1.0D));
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 65bae8c9f2..32b75f710b 100644
+index 65bae8c9f..32b75f710 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -21,6 +21,23 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable {
@@ -61,7 +61,7 @@ index 65bae8c9f2..32b75f710b 100644
      public void setAngerTarget(@Nullable UUID uuid) {
          this.br = uuid;
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index e3606722cb..b90ea31440 100644
+index e3606722c..b90ea3144 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -137,7 +137,7 @@ index e3606722cb..b90ea31440 100644
  
          public GroupDataZombie(boolean flag, boolean flag1) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 2d2830adc5..ce6d797801 100644
+index 2d2830adc..ce6d79780 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie {
@@ -165,7 +165,7 @@ index 2d2830adc5..ce6d797801 100644
          return b(entitytypes, worldaccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || worldaccess.e(blockposition));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index a5214914a1..b86816205c 100644
+index e021c43b4..505c83f3e 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -28,6 +28,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -193,7 +193,7 @@ index a5214914a1..b86816205c 100644
      protected void initDatawatcher() {
          super.initDatawatcher();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8773003e6f..1254c3d322 100644
+index 66425f79a..14e05b7a7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -264,6 +264,15 @@ public class PurpurWorldConfig {
@@ -212,8 +212,8 @@ index 8773003e6f..1254c3d322 100644
      public boolean enderDragonAlwaysDropsEggBlock = false;
      public boolean enderDragonAlwaysDropsFullExp = false;
      private void enderDragonSettings() {
-@@ -298,6 +307,15 @@ public class PurpurWorldConfig {
-         giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
+@@ -303,6 +312,15 @@ public class PurpurWorldConfig {
+         giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
      }
  
 +    public boolean huskJockeyOnlyBaby = true;
@@ -225,10 +225,10 @@ index 8773003e6f..1254c3d322 100644
 +        huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
 +    }
 +
-     public double illusionerMaxHealth = 32.0D;
      public double illusionerMovementSpeed = 0.5D;
      public double illusionerFollowRange = 18.0D;
-@@ -368,8 +386,35 @@ public class PurpurWorldConfig {
+     public double illusionerMaxHealth = 32.0D;
+@@ -378,8 +396,35 @@ public class PurpurWorldConfig {
          witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
      }
  

patches/server/0085-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
-index 6fe5678cff..bd0267ee4b 100644
+index 6fe5678cf..bd0267ee4 100644
 --- a/src/main/java/net/minecraft/server/DamageSource.java
 +++ b/src/main/java/net/minecraft/server/DamageSource.java
 @@ -88,6 +88,7 @@ public class DamageSource {
@@ -17,7 +17,7 @@ index 6fe5678cff..bd0267ee4b 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5ec82345e1..974e75945d 100644
+index 5ec82345e..974e75945 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2135,8 +2135,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index 5ec82345e1..974e75945d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
-index 362ca695d8..1942fae270 100644
+index 362ca695d..1942fae27 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -100,7 +100,7 @@ index 362ca695d8..1942fae270 100644
      @Override
      protected void saveData(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 3a70900c73..dfce36368d 100644
+index 3a70900c7..dfce36368 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -9,9 +9,10 @@ import javax.annotation.Nullable;
@@ -321,10 +321,10 @@ index 3a70900c73..dfce36368d 100644
  
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1254c3d322..ad055f4241 100644
+index 14e05b7a7..dbeea1ece 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -330,6 +330,15 @@ public class PurpurWorldConfig {
+@@ -340,6 +340,15 @@ public class PurpurWorldConfig {
          ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
      }
  

patches/server/0086-Add-phantom-spawning-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom spawning options
 
 
 diff --git a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java
-index 75745af343..84c0ec1b50 100644
+index 75745af34..84c0ec1b5 100644
 --- a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java
 +++ b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java
 @@ -13,6 +13,7 @@ public class DifficultyDamageScaler {
@@ -25,7 +25,7 @@ index 75745af343..84c0ec1b50 100644
          return this.b > f;
      }
 diff --git a/src/main/java/net/minecraft/server/EnumDifficulty.java b/src/main/java/net/minecraft/server/EnumDifficulty.java
-index e0e72779c0..386eae71a1 100644
+index e0e72779c..386eae71a 100644
 --- a/src/main/java/net/minecraft/server/EnumDifficulty.java
 +++ b/src/main/java/net/minecraft/server/EnumDifficulty.java
 @@ -19,6 +19,7 @@ public enum EnumDifficulty {
@@ -37,7 +37,7 @@ index e0e72779c0..386eae71a1 100644
          return this.f;
      }
 diff --git a/src/main/java/net/minecraft/server/IBlockLightAccess.java b/src/main/java/net/minecraft/server/IBlockLightAccess.java
-index 03a89301f2..fa5eb188da 100644
+index 03a89301f..fa5eb188d 100644
 --- a/src/main/java/net/minecraft/server/IBlockLightAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockLightAccess.java
 @@ -12,6 +12,7 @@ public interface IBlockLightAccess extends IBlockAccess {
@@ -49,7 +49,7 @@ index 03a89301f2..fa5eb188da 100644
          return this.getBrightness(EnumSkyBlock.SKY, blockposition) >= this.K();
      }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 4e3f01bc79..ac1ea2f0c1 100644
+index 4e3f01bc7..ac1ea2f0c 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -1,85 +1,99 @@
@@ -221,7 +221,7 @@ index 4e3f01bc79..ac1ea2f0c1 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 661ad8f8e6..ee91c33a7a 100644
+index 661ad8f8e..ee91c33a7 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -385,6 +385,7 @@ public final class SpawnerCreature {
@@ -233,7 +233,7 @@ index 661ad8f8e6..ee91c33a7a 100644
          return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ca4d260e8f..a8571dae8d 100644
+index ca4d260e8..a8571dae8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1564,6 +1564,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -245,10 +245,10 @@ index ca4d260e8f..a8571dae8d 100644
      public int c() {
          return this.d;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f4362093f3..b4e19576ae 100644
+index dbeea1ece..813ce4cec 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -335,10 +335,34 @@ public class PurpurWorldConfig {
+@@ -343,10 +343,34 @@ public class PurpurWorldConfig {
      public double phantomAttackedByCrystalRadius = 0.0D;
      public float phantomAttackedByCrystalDamage = 1.0F;
      public double phantomOrbitCrystalRadius = 0.0D;

patches/server/0086-Customizable-EnderDragon-Health.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Bierque <bierquejason@gmail.com>
-Date: Wed, 1 Jul 2020 22:36:06 +0200
-Subject: [PATCH] Customizable EnderDragon Health
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index a5a2182455..d2fcd0bc16 100644
---- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
-+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-@@ -62,6 +62,16 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
-         this.bG = new DragonControllerManager(this);
-     }
- 
-+    // Purpur start
-+    @Override
-+    public void initAttributes(World world) {
-+        if (world != null) {
-+            this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(world.purpurConfig.enderDragonMaxHealth);
-+            setHealth(getMaxHealth());
-+        }
-+    }
-+    // Purpur end
-+
-     public static AttributeProvider.Builder m() {
-         return EntityInsentient.p().a(GenericAttributes.MAX_HEALTH, 200.0D);
-     }
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ad055f4241..f4362093f3 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -275,9 +275,11 @@ public class PurpurWorldConfig {
- 
-     public boolean enderDragonAlwaysDropsEggBlock = false;
-     public boolean enderDragonAlwaysDropsFullExp = false;
-+    public double enderDragonMaxHealth = 200.0D;
-     private void enderDragonSettings() {
-         enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender_dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
-         enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
-+        enderDragonMaxHealth = getDouble("mobs.ender_dragon.max-health", enderDragonMaxHealth);
-     }
- 
-     public boolean endermanAllowGriefing = true;

patches/server/0087-Implement-bed-explosion-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement bed explosion options
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 24a5c64b65..738535d01a 100644
+index 24a5c64b6..738535d01 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -88,7 +88,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -18,7 +18,7 @@ index 24a5c64b65..738535d01a 100644
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b4e19576ae..415286b2bd 100644
+index 813ce4cec..7b47c4023 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2,6 +2,7 @@ package net.pl3x.purpur;

patches/server/0088-Implement-respawn-anchor-explosion-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement respawn anchor explosion options
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java
-index 21c5ad83a9..521d161a3d 100644
+index 21c5ad83a..521d161a3 100644
 --- a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java
 +++ b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java
 @@ -83,10 +83,7 @@ public class BlockRespawnAnchor extends Block {
@@ -30,7 +30,7 @@ index 21c5ad83a9..521d161a3d 100644
  
      public static boolean a(World world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 415286b2bd..14996fcaed 100644
+index 7b47c4023..91d7d123b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -240,6 +240,22 @@ public class PurpurWorldConfig {

patches/server/0089-Add-allow-water-in-end-world-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add allow water in end world option
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIce.java b/src/main/java/net/minecraft/server/BlockIce.java
-index aba5c6b871..b75f6ded5d 100644
+index aba5c6b87..b75f6ded5 100644
 --- a/src/main/java/net/minecraft/server/BlockIce.java
 +++ b/src/main/java/net/minecraft/server/BlockIce.java
 @@ -13,7 +13,7 @@ public class BlockIce extends BlockHalfTransparent {
@@ -27,7 +27,7 @@ index aba5c6b871..b75f6ded5d 100644
          } else {
              world.setTypeUpdate(blockposition, Blocks.WATER.getBlockData());
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 120bf8436f..848a185c04 100644
+index 120bf8436..848a185c0 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -122,7 +122,7 @@ public class ItemBucket extends Item {
@@ -49,7 +49,7 @@ index 120bf8436f..848a185c04 100644
  
                  return true;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a8571dae8d..7a82a894bb 100644
+index a8571dae8..7a82a894b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1639,4 +1639,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -68,7 +68,7 @@ index a8571dae8d..7a82a894bb 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 68b3f1def3..cb7ea33361 100644
+index f137d2a28..35e54a7df 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,7 +1,6 @@

patches/server/0090-Allow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7676659f44..bd206f1810 100644
+index 7676659f4..bd206f181 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1003,7 +1003,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0091-Entity-lifespan.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7a40f08646..1d5d87e619 100644
+index 7a40f0864..1d5d87e61 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -92,7 +92,7 @@ index 7a40f08646..1d5d87e619 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bd206f1810..a57588acf0 100644
+index bd206f181..a57588acf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2214,6 +2214,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -104,7 +104,7 @@ index bd206f1810..a57588acf0 100644
                          event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
                      } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 14996fcaed..8126603aab 100644
+index 91d7d123b..2f326f882 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -103,6 +103,11 @@ public class PurpurWorldConfig {

patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 27838680a2..0d67c9c6cc 100644
+index 27838680a..0d67c9c6c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -277,6 +277,7 @@ public abstract class EntityLiving extends Entity {
@@ -17,7 +17,7 @@ index 27838680a2..0d67c9c6cc 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 36168d0f7c..69be072e76 100644
+index 36168d0f7..69be072e7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -2366,4 +2366,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -48,7 +48,7 @@ index 36168d0f7c..69be072e76 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8126603aab..cc0752f253 100644
+index 2f326f882..73027d6ee 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -178,6 +178,11 @@ public class PurpurWorldConfig {

patches/server/0093-Squid-EAR-immunity.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cc0752f253..47df73beca 100644
+index 73027d6ee..de2d072b2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -436,6 +436,11 @@ public class PurpurWorldConfig {
+@@ -444,6 +444,11 @@ public class PurpurWorldConfig {
          snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
      }
  
@@ -21,7 +21,7 @@ index cc0752f253..47df73beca 100644
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerCanBeLeashed = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index b47d6fa2de..ff0621e08a 100644
+index b47d6fa2d..ff0621e08 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -378,6 +378,7 @@ public class ActivationRange

patches/server/0094-Configurable-end-spike-seed.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end spike seed
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenEnder.java b/src/main/java/net/minecraft/server/WorldGenEnder.java
-index 00a1707209..5eb9b3d35e 100644
+index 00a170720..5eb9b3d35 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEnder.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEnder.java
 @@ -23,12 +23,14 @@ public class WorldGenEnder extends WorldGenerator<WorldGenFeatureEndSpikeConfigu
@@ -25,7 +25,7 @@ index 00a1707209..5eb9b3d35e 100644
          List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.c();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index cb7ea33361..ac023770ea 100644
+index 35e54a7df..5405928a6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@

patches/server/0095-Configurable-dungeon-seed.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable dungeon seed
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java
-index 07f7b69fef..6aa1626f38 100644
+index 07f7b69fe..6aa1626f3 100644
 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java
 +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java
 @@ -11,12 +11,21 @@ public class WorldGenDungeons extends WorldGenerator<WorldGenFeatureEmptyConfigu
@@ -31,7 +31,7 @@ index 07f7b69fef..6aa1626f38 100644
          int i = random.nextInt(2) + 2;
          int j = -i - 1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ac023770ea..a26ef47c46 100644
+index 5405928a6..37f666251 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,10 +141,13 @@ public class PurpurConfig {

patches/server/0096-Phantoms-burn-in-light.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index dfce36368d..bdfe073dcd 100644
+index dfce36368..bdfe073dc 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -13,6 +13,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index dfce36368d..bdfe073dcd 100644
                  return false;
              } else {
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 4c379916d8..ea6b61c9b8 100644
+index 4c379916d..ea6b61c9b 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -173,7 +173,7 @@ public class Items {
@@ -70,10 +70,10 @@ index 4c379916d8..ea6b61c9b8 100644
      public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b);
      public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 47df73beca..2403920ae2 100644
+index de2d072b2..a3568dfbe 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -391,6 +391,9 @@ public class PurpurWorldConfig {
+@@ -399,6 +399,9 @@ public class PurpurWorldConfig {
      public int phantomSpawnOverheadRadius = 10;
      public int phantomSpawnMinPerAttempt = 1;
      public int phantomSpawnMaxPerAttempt = -1;
@@ -83,7 +83,7 @@ index 47df73beca..2403920ae2 100644
      private void phantomSettings() {
          phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
          phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
-@@ -407,6 +410,9 @@ public class PurpurWorldConfig {
+@@ -415,6 +418,9 @@ public class PurpurWorldConfig {
          phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
          phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
          phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

patches/server/0097-Configurable-villager-breeding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 33b7bc39fb..7cf6d4a4cd 100644
+index 894089d66..5d37cb14f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -642,7 +642,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -18,10 +18,10 @@ index 33b7bc39fb..7cf6d4a4cd 100644
  
      private boolean fr() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2403920ae2..781fb04286 100644
+index a3568dfbe..22a79a530 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -454,6 +454,7 @@ public class PurpurWorldConfig {
+@@ -462,6 +462,7 @@ public class PurpurWorldConfig {
      public boolean villagerFollowEmeraldBlock = false;
      public int villagerSpawnIronGolemRadius = 0;
      public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index 2403920ae2..781fb04286 100644
      private void villagerSettings() {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
-@@ -462,6 +463,7 @@ public class PurpurWorldConfig {
+@@ -470,6 +471,7 @@ public class PurpurWorldConfig {
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

patches/server/0098-Redstone-deactivates-spawners.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Redstone deactivates spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index c2e830db7a..3b4cc9871c 100644
+index c2e830db7..3b4cc9871 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -51,6 +51,7 @@ public abstract class MobSpawnerAbstract {
@@ -26,7 +26,7 @@ index c2e830db7a..3b4cc9871c 100644
      public abstract BlockPosition b();
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 781fb04286..3bc976310e 100644
+index 22a79a530..ec84ec529 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -273,6 +273,11 @@ public class PurpurWorldConfig {

patches/server/0099-Totems-work-in-inventory.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0d67c9c6cc..0fe6f90ea6 100644
+index 0d67c9c6c..0fe6f90ea 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1318,6 +1318,19 @@ public abstract class EntityLiving extends Entity {
@@ -29,7 +29,7 @@ index 0d67c9c6cc..0fe6f90ea6 100644
              event.setCancelled(itemstack == null);
              this.world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3bc976310e..012ea27128 100644
+index ec84ec529..48c8cbf95 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -183,6 +183,11 @@ public class PurpurWorldConfig {

patches/server/0100-Fix-death-message-colors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 36168d0f7c..563eb77ce3 100644
+index 69be072e7..05f9a8185 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -839,7 +839,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a57588acf0..261dbea122 100644
+index a57588acf..261dbea12 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1973,7 +1973,15 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0102-Populator-seed-controls.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Populator seed controls
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index dae2e5d707..55b67f1057 100644
+index dae2e5d70..55b67f105 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -293,7 +293,7 @@ public class TimingsExport extends Thread {
@@ -18,7 +18,7 @@ index dae2e5d707..55b67f1057 100644
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 42ce3b8021..03e4d9d8bd 100644
+index 42ce3b802..03e4d9d8b 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -1,5 +1,6 @@
@@ -50,7 +50,7 @@ index 42ce3b8021..03e4d9d8bd 100644
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 0854ac9ef5..df6874c1cf 100644
+index 0854ac9ef..df6874c1c 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -189,6 +189,10 @@ public final class BiomeBase {

patches/server/0103-Add-vindicator-johnny-spawn-chance.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add vindicator johnny spawn chance
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index c0d26aa9dc..8f812aa913 100644
+index c0d26aa9d..8f812aa91 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -81,6 +81,12 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -22,7 +22,7 @@ index c0d26aa9dc..8f812aa913 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 012ea27128..d09cead853 100644
+index 48c8cbf95..a26529e93 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -40,6 +40,11 @@ public class PurpurWorldConfig {

patches/server/0104-DragonEggPlaceEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] DragonEggPlaceEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index f853f6c424..5199cba870 100644
+index f853f6c42..5199cba87 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -359,7 +359,13 @@ public class EnderDragonBattle {

patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable mushroom block updates
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockHugeMushroom.java b/src/main/java/net/minecraft/server/BlockHugeMushroom.java
-index e8f340b9f2..3490af6fe0 100644
+index e8f340b9f..3490af6fe 100644
 --- a/src/main/java/net/minecraft/server/BlockHugeMushroom.java
 +++ b/src/main/java/net/minecraft/server/BlockHugeMushroom.java
 @@ -14,30 +14,57 @@ public class BlockHugeMushroom extends Block {
@@ -73,7 +73,7 @@ index e8f340b9f2..3490af6fe0 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a26ef47c46..4177be0337 100644
+index 37f666251..46d99d1e7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -205,6 +205,11 @@ public class PurpurConfig {

patches/server/0106-Dispensers-place-anvils-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option
 
 
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index c9963c1989..e3ba447eb7 100644
+index c9963c198..e3ba447eb 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -102,6 +102,7 @@ public enum EnumDirection implements INamable {
@@ -33,7 +33,7 @@ index c9963c1989..e3ba447eb7 100644
          return this.k;
      }
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index 7b8a470d97..d1f9d2884d 100644
+index 7b8a470d9..d1f9d2884 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -915,6 +915,23 @@ public interface IDispenseBehavior {
@@ -61,7 +61,7 @@ index 7b8a470d97..d1f9d2884d 100644
  
      static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d09cead853..8dc4906b57 100644
+index a26529e93..73969ac44 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -240,8 +240,10 @@ public class PurpurWorldConfig {

patches/server/0107-Allow-anvil-colors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow anvil colors
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 4aa6b035a6..5e4e59e5c8 100644
+index 4aa6b035a..5e4e59e5c 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -251,6 +251,25 @@ public class ContainerAnvil extends ContainerAnvilAbstract {
@@ -35,7 +35,7 @@ index 4aa6b035a6..5e4e59e5c8 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8dc4906b57..e957d4f2df 100644
+index 73969ac44..876a51801 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -216,6 +216,11 @@ public class PurpurWorldConfig {

patches/server/0108-Add-no-tick-block-list.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add no-tick block list
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 4d1ac4e6b6..483756316a 100644
+index 4d1ac4e6b..483756316 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -655,10 +655,12 @@ public abstract class BlockBase {
@@ -22,7 +22,7 @@ index 4d1ac4e6b6..483756316a 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 03dc6ab4b2..66883ea891 100644
+index 03dc6ab4b..66883ea89 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -314,14 +314,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -43,7 +43,7 @@ index 03dc6ab4b2..66883ea891 100644
              this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
                  return fluidtype == null || fluidtype == FluidTypes.EMPTY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e957d4f2df..992268620b 100644
+index 876a51801..4b96afcbf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection;

patches/server/0109-Add-option-to-disable-dolphin-treasure-searching.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
-index 2916ee89ef..664f969336 100644
+index 2916ee89e..664f96933 100644
 --- a/src/main/java/net/minecraft/server/EntityDolphin.java
 +++ b/src/main/java/net/minecraft/server/EntityDolphin.java
 @@ -329,6 +329,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -17,7 +17,7 @@ index 2916ee89ef..664f969336 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 992268620b..226d64798f 100644
+index 4b96afcbf..9c7dec1b4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -342,6 +342,11 @@ public class PurpurWorldConfig {

patches/server/0110-Short-enderman-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Short enderman height
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 7b175240e4..e336403266 100644
+index 7b175240e..e33640326 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -321,6 +321,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -17,7 +17,7 @@ index 7b175240e4..e336403266 100644
              if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 37b984a5b6..7a35a367a5 100644
+index 37b984a5b..7a35a367a 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -34,7 +34,7 @@ public class EntityTypes<T extends Entity> {
@@ -30,7 +30,7 @@ index 37b984a5b6..7a35a367a5 100644
      public static final EntityTypes<EntityEvoker> EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8));
      public static final EntityTypes<EntityEvokerFangs> EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4177be0337..79fc12f499 100644
+index 46d99d1e7..f75df9990 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -190,6 +190,11 @@ public class PurpurConfig {

patches/server/0111-Stop-squids-floating-on-top-of-water.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 974e75945d..9679722a57 100644
+index 974e75945..9679722a5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -3438,8 +3438,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -24,7 +24,7 @@ index 974e75945d..9679722a57 100644
          int j = MathHelper.f(axisalignedbb.maxX);
          int k = MathHelper.floor(axisalignedbb.minY);
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index b21605a623..148e4b1587 100644
+index b21605a62..148e4b158 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -25,6 +25,14 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -43,10 +43,10 @@ index b21605a623..148e4b1587 100644
      protected void initPathfinder() {
          this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 226d64798f..8d7da9fe0b 100644
+index 9c7dec1b4..5cc717c8d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -482,8 +482,10 @@ public class PurpurWorldConfig {
+@@ -490,8 +490,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean squidImmuneToEAR = true;

patches/server/0113-Use-configured-height-for-nether-surface-builders.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Use configured height for nether surface builders
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
-index 462f0b2bae..f418a71ca8 100644
+index 462f0b2ba..f418a71ca 100644
 --- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
 +++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
 @@ -35,7 +35,7 @@ public abstract class WorldGenSurfaceNetherAbstract extends WorldGenSurface<Worl

patches/server/0114-Crying-obsidian-valid-for-portal-frames.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Crying obsidian valid for portal frames
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 1fc98698b8..d621b11ba9 100644
+index 1fc98698b..d621b11ba 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -100,6 +100,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -17,7 +17,7 @@ index 1fc98698b8..d621b11ba9 100644
          return this == block;
      }
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 483756316a..5550693a4e 100644
+index 483756316..5550693a4 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -725,6 +725,7 @@ public abstract class BlockBase {
@@ -29,7 +29,7 @@ index 483756316a..5550693a4e 100644
              return this.getBlock().a(block);
          }
 diff --git a/src/main/java/net/minecraft/server/BlockPortalShape.java b/src/main/java/net/minecraft/server/BlockPortalShape.java
-index 6ef81aeb4c..9ea3c30b67 100644
+index 6ef81aeb4..9ea3c30b6 100644
 --- a/src/main/java/net/minecraft/server/BlockPortalShape.java
 +++ b/src/main/java/net/minecraft/server/BlockPortalShape.java
 @@ -14,7 +14,7 @@ import org.bukkit.event.world.PortalCreateEvent;
@@ -42,7 +42,7 @@ index 6ef81aeb4c..9ea3c30b67 100644
      private final GeneratorAccess b;
      private final EnumDirection.EnumAxis c;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0f981dc160..a6f4642c44 100644
+index 6e22d0cd0..b71d3187e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -176,6 +176,7 @@ public class PurpurConfig {

patches/server/0115-Entities-can-use-portals-configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7e379aa144..13227c558b 100644
+index 7e379aa14..13227c558 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2411,7 +2411,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -27,7 +27,7 @@ index 7e379aa144..13227c558b 100644
  
      public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2921619972..fb6fad7986 100644
+index a222cd43a..1025b5dae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -140,6 +140,7 @@ public class PurpurWorldConfig {

patches/server/0116-LivingEntity-broadcastItemBreak.patch

@@ -5,7 +5,7 @@ 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 6644723124..62bdc1abe3 100644
+index 664472312..62bdc1abe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -827,5 +827,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0117-Customizable-wither-health-and-healing.patch

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: jmp <jasonpenilla2@me.com>
 Date: Thu, 20 Aug 2020 17:38:12 -0700
-Subject: [PATCH] Customizable WitherBoss Health and Healing
+Subject: [PATCH] Customizable wither health and healing
 
-Adds the ability to customize the health of the Wither Boss, as well as the amount that it heals, and how often in the PurpurWorldConfig.
+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/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index f68cf834aa..4cac2bd091 100644
+index f68cf834a..e8cc3af60 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
-@@ -145,6 +145,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+@@ -145,6 +145,13 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
          skull.setPositionRaw(headX, headY, headZ);
          world.addEntity(skull);
      }
@@ -17,12 +17,13 @@ index f68cf834aa..4cac2bd091 100644
 +    public void initAttributes(World world) {
 +        if (world != null) {
 +            this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(world.purpurConfig.witherMaxHealth);
++            //setHealth(getMaxHealth()); // do NOT do this for wither! health grows when first spawned
 +        }
 +    }
      // Purpur end
  
      @Override
-@@ -348,7 +354,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+@@ -348,7 +355,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
  
              this.setInvul(i);
              if (this.ticksLived % 10 == 0) {
@@ -31,7 +32,7 @@ index f68cf834aa..4cac2bd091 100644
              }
  
          } else {
-@@ -457,8 +463,10 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+@@ -457,8 +464,10 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
                  }
              }
  
@@ -44,7 +45,7 @@ index f68cf834aa..4cac2bd091 100644
              }
  
              //this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down
-@@ -473,6 +481,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+@@ -473,6 +482,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
      public void beginSpawnSequence() {
          this.setInvul(220);
          this.setHealth(this.getMaxHealth() / 3.0F);
@@ -53,23 +54,28 @@ index f68cf834aa..4cac2bd091 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fb6fad7986..fe35bdd100 100644
+index 1025b5dae..0f2e0e779 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -902,10 +902,16 @@ public class PurpurWorldConfig {
+@@ -910,10 +910,21 @@ public class PurpurWorldConfig {
      public boolean witherRidable = false;
      public boolean witherRidableInWater = false;
      public double witherMaxY = 256D;
-+    public double witherMaxHealth = 300.0D;
 +    public float witherHealthRegenAmount = 1.0f;
 +    public int witherHealthRegenDelay = 20;
++    public double witherMaxHealth = 300.0D;
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
          witherMaxY = getDouble("mobs.wither.ridable-max-y", witherMaxY);
-+        witherMaxHealth = getDouble("mobs.wither.max-health", witherMaxHealth);
 +        witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
 +        witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
++        if (PurpurConfig.version < 8) {
++            double oldValue = getDouble("mobs.wither.max-health", witherMaxHealth);
++            set("mobs.wither.attributes.max-health", oldValue);
++            set("mobs.wither.max-health", null);
++        }
++        witherMaxHealth = getDouble("mobs.wither.attributes.max-health", witherMaxHealth);
      }
  
      public boolean witherSkeletonRidable = false;

patches/server/0118-Allow-toggling-special-MobSpawners-per-world.patch

@@ -6,7 +6,7 @@ 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/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
-index 8d89f51182..072ec40f75 100644
+index 8d89f5118..072ec40f7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
 @@ -132,7 +132,17 @@ public class MobSpawnerTrader implements MobSpawner {
@@ -29,7 +29,7 @@ index 8d89f51182..072ec40f75 100644
              if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bdfdb73bc1..ab97d076c9 100644
+index bdfdb73bc..ab97d076c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -156,7 +156,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -42,7 +42,7 @@ index bdfdb73bc1..ab97d076c9 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index bc35bfd96a..644ff68795 100644
+index bc35bfd96..644ff6879 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -332,7 +332,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -72,7 +72,7 @@ index bc35bfd96a..644ff68795 100644
          this.worldDataServer = (WorldDataServer) iworlddataserver;
          worldDataServer.world = this;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fe35bdd100..f0b09ec3ae 100644
+index 0f2e0e779..92a1fb69e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry;

patches/server/0119-Raid-cooldown-setting.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Raid cooldown setting
 
 
 diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java
-index 826dcf9f7e..807910c60e 100644
+index 826dcf9f7..807910c60 100644
 --- a/src/main/java/net/minecraft/server/PersistentRaid.java
 +++ b/src/main/java/net/minecraft/server/PersistentRaid.java
 @@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@@ -52,7 +52,7 @@ index 826dcf9f7e..807910c60e 100644
                      if (!this.raids.containsKey(raid.getId())) {
                          this.raids.put(raid.getId(), raid);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f0b09ec3ae..27b9dcfec6 100644
+index 92a1fb69e..19e43dd63 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -155,6 +155,7 @@ public class PurpurWorldConfig {

patches/server/0120-Despawn-rate-config-options-per-projectile-type.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type
 Default values of -1 respect vanilla behaviour.
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 1e7f5957d8..7f89b269e3 100644
+index 1e7f5957d..7f89b269e 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -23,7 +23,7 @@ public abstract class EntityArrow extends IProjectile {
@@ -48,7 +48,7 @@ index 1e7f5957d8..7f89b269e3 100644
  
      private void A() {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 27032abad4..9d2d5be5ee 100644
+index 27032abad..9d2d5be5e 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -75,4 +75,11 @@ public class EntityDragonFireball extends EntityFireball {
@@ -64,7 +64,7 @@ index 27032abad4..9d2d5be5ee 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
-index edce89169b..4951abdfa1 100644
+index edce89169..4951abdfa 100644
 --- a/src/main/java/net/minecraft/server/EntityEgg.java
 +++ b/src/main/java/net/minecraft/server/EntityEgg.java
 @@ -87,4 +87,11 @@ public class EntityEgg extends EntityProjectileThrowable {
@@ -80,7 +80,7 @@ index edce89169b..4951abdfa1 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index 63b4a449b5..e8650c1bfa 100644
+index 63b4a449b..e8650c1bf 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
 @@ -106,4 +106,11 @@ public class EntityEnderPearl extends EntityProjectileThrowable {
@@ -96,7 +96,7 @@ index 63b4a449b5..e8650c1bfa 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index a646dc9f03..9789d480ad 100644
+index a646dc9f0..9789d480a 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -298,4 +298,11 @@ public class EntityFireworks extends IProjectile {
@@ -112,7 +112,7 @@ index a646dc9f03..9789d480ad 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 519df0002b..6891e61bcf 100644
+index 519df0002..6891e61bc 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -576,4 +576,11 @@ public class EntityFishingHook extends IProjectile {
@@ -128,7 +128,7 @@ index 519df0002b..6891e61bcf 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLargeFireball.java b/src/main/java/net/minecraft/server/EntityLargeFireball.java
-index b4b0dfbc70..d12de20cf4 100644
+index b4b0dfbc7..d12de20cf 100644
 --- a/src/main/java/net/minecraft/server/EntityLargeFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityLargeFireball.java
 @@ -66,4 +66,11 @@ public class EntityLargeFireball extends EntityFireballFireball {
@@ -144,7 +144,7 @@ index b4b0dfbc70..d12de20cf4 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
-index 7636a51a7e..3e6438c977 100644
+index 7636a51a7..3e6438c97 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 @@ -71,4 +71,11 @@ public class EntityLlamaSpit extends IProjectile {
@@ -160,7 +160,7 @@ index 7636a51a7e..3e6438c977 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
-index d57da221c1..6d4b1e58df 100644
+index d57da221c..6d4b1e58d 100644
 --- a/src/main/java/net/minecraft/server/EntityPotion.java
 +++ b/src/main/java/net/minecraft/server/EntityPotion.java
 @@ -240,4 +240,11 @@ public class EntityPotion extends EntityProjectileThrowable {
@@ -176,7 +176,7 @@ index d57da221c1..6d4b1e58df 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityShulkerBullet.java b/src/main/java/net/minecraft/server/EntityShulkerBullet.java
-index 23017b5486..0b16473aed 100644
+index 23017b548..0b16473ae 100644
 --- a/src/main/java/net/minecraft/server/EntityShulkerBullet.java
 +++ b/src/main/java/net/minecraft/server/EntityShulkerBullet.java
 @@ -313,4 +313,11 @@ public class EntityShulkerBullet extends IProjectile {
@@ -192,7 +192,7 @@ index 23017b5486..0b16473aed 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java
-index 350e92ac99..4ed7a20bfe 100644
+index 350e92ac9..4ed7a20bf 100644
 --- a/src/main/java/net/minecraft/server/EntitySmallFireball.java
 +++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java
 @@ -86,4 +86,11 @@ public class EntitySmallFireball extends EntityFireballFireball {
@@ -208,7 +208,7 @@ index 350e92ac99..4ed7a20bfe 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySnowball.java b/src/main/java/net/minecraft/server/EntitySnowball.java
-index e44249f59b..34a5f481e6 100644
+index e44249f59..34a5f481e 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowball.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowball.java
 @@ -14,6 +14,12 @@ public class EntitySnowball extends EntityProjectileThrowable {
@@ -225,7 +225,7 @@ index e44249f59b..34a5f481e6 100644
      protected Item getDefaultItem() {
          return Items.SNOWBALL;
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 2d3ca8c424..1d32518bd7 100644
+index 2d3ca8c42..1d32518bd 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -51,4 +51,11 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@@ -241,7 +241,7 @@ index 2d3ca8c424..1d32518bd7 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
-index 2c02e114cc..4a97a7517d 100644
+index 2c02e114c..4a97a7517 100644
 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
 @@ -116,4 +116,11 @@ public class EntityWitherSkull extends EntityFireball {
@@ -257,7 +257,7 @@ index 2c02e114cc..4a97a7517d 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
-index b9f8ed3554..58f03f1d2e 100644
+index b9f8ed355..58f03f1d2 100644
 --- a/src/main/java/net/minecraft/server/IProjectile.java
 +++ b/src/main/java/net/minecraft/server/IProjectile.java
 @@ -13,11 +13,25 @@ public abstract class IProjectile extends Entity {
@@ -300,7 +300,7 @@ index b9f8ed3554..58f03f1d2e 100644
  
      public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 27b9dcfec6..6b76469033 100644
+index 19e43dd63..7dcc0211b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -147,6 +147,35 @@ public class PurpurWorldConfig {

patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Add hex color code support for console logging
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-index 685deaa0e5..2a0ada490b 100644
+index 685deaa0e..2a0ada490 100644
 --- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -1,17 +1,52 @@
@@ -63,7 +63,7 @@ index 685deaa0e5..2a0ada490b 100644
 +    }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a6f4642c44..d6408629c4 100644
+index b71d3187e..bcb9857b7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -221,9 +221,11 @@ public class PurpurConfig {

patches/server/0122-Add-option-to-disable-zombie-aggressiveness-towards-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
 
 
 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 89b56de756..ded483ace0 100644
+index 89b56de75..ded483ace 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 @@ -131,6 +131,10 @@ public class MobGoalHelper {
@@ -21,7 +21,7 @@ index 89b56de756..ded483ace0 100644
          ignored.add("selector_1");
          ignored.add("selector_2");
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 125eab60f2..638efc67d6 100644
+index 125eab60f..638efc67d 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -58,7 +58,18 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -45,7 +45,7 @@ index 125eab60f2..638efc67d6 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index e2f68d843c..3ad8bd0847 100644
+index e2f68d843..3ad8bd084 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -85,7 +85,18 @@ public class EntityZombie extends EntityMonster {
@@ -69,10 +69,10 @@ index e2f68d843c..3ad8bd0847 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6b76469033..b83e32cd16 100644
+index 7dcc0211b..f04e2e562 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -999,12 +999,14 @@ public class PurpurWorldConfig {
+@@ -1012,12 +1012,14 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;

patches/server/0123-Persistent-TileEntity-Lore-and-DisplayName.patch

@@ -7,7 +7,7 @@ Makes it so that when a TileEntity is placed in the world and then broken,
 the dropped ItemStack retains any original custom display name/lore.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index d621b11ba9..c276a2896b 100644
+index d621b11ba..c276a2896 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -207,7 +207,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -79,7 +79,7 @@ index d621b11ba9..c276a2896b 100644
          if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
              float f = 0.5F;
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index bbb1de7d1a..d97efe3d47 100644
+index bbb1de7d1..d97efe3d4 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -96,7 +96,24 @@ public class ItemBlock extends Item {
@@ -109,7 +109,7 @@ index bbb1de7d1a..d97efe3d47 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 58d958a88a..8e87490954 100644
+index 58d958a88..8e8749095 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -90,9 +90,25 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -165,7 +165,7 @@ index 58d958a88a..8e87490954 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b83e32cd16..e49746df3b 100644
+index f04e2e562..4d97a2323 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -182,6 +182,7 @@ public class PurpurWorldConfig {

patches/server/0124-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
 
 
 diff --git a/src/main/java/net/minecraft/server/RecipeItemStack.java b/src/main/java/net/minecraft/server/RecipeItemStack.java
-index 0f96abd0ca..f6d9294940 100644
+index 0f96abd0c..f6d929494 100644
 --- a/src/main/java/net/minecraft/server/RecipeItemStack.java
 +++ b/src/main/java/net/minecraft/server/RecipeItemStack.java
 @@ -26,6 +26,7 @@ public final class RecipeItemStack implements Predicate<ItemStack> {
@@ -30,7 +30,7 @@ index 0f96abd0ca..f6d9294940 100644
                  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 ef29599a89..18413e6327 100644
+index ef29599a8..18413e632 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
 @@ -22,6 +22,7 @@ public interface CraftRecipe extends Recipe {

patches/server/0125-Flying-squids-Oh-my.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying squids! Oh my!
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 70b952f10a..cee2265016 100644
+index 70b952f10..cee226501 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -51,6 +51,11 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -38,10 +38,10 @@ index 70b952f10a..cee2265016 100644
                  float f1 = MathHelper.cos(f) * 0.2F;
                  float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e49746df3b..ba46d21ed7 100644
+index 4d97a2323..70e8092af 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -860,10 +860,12 @@ public class PurpurWorldConfig {
+@@ -868,10 +868,12 @@ public class PurpurWorldConfig {
      public boolean squidRidable = false;
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;

patches/server/0126-Infinity-bow-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Infinity bow settings
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index dd6a93dc78..8241f3dafa 100644
+index dd6a93dc7..8241f3daf 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -24,7 +24,7 @@ public class ItemBow extends ItemProjectileWeapon implements ItemVanishable {
@@ -26,7 +26,7 @@ index dd6a93dc78..8241f3dafa 100644
                      entityhuman.b(StatisticList.ITEM_USED.b(this));
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ba46d21ed7..c0ec288c05 100644
+index 70e8092af..5b007f26d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -147,6 +147,15 @@ public class PurpurWorldConfig {

patches/server/0127-Stonecutter-damage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockStonecutter.java b/src/main/java/net/minecraft/server/BlockStonecutter.java
-index 3e57abd33e..08ba9e1c4e 100644
+index 3e57abd33..08ba9e1c4 100644
 --- a/src/main/java/net/minecraft/server/BlockStonecutter.java
 +++ b/src/main/java/net/minecraft/server/BlockStonecutter.java
 @@ -71,4 +71,16 @@ public class BlockStonecutter extends Block {
@@ -26,7 +26,7 @@ index 3e57abd33e..08ba9e1c4e 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index 33804e6893..fabadcd7a2 100644
+index 33804e689..fabadcd7a 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -480,7 +480,7 @@ public class PathfinderNormal extends PathfinderAbstract {
@@ -39,7 +39,7 @@ index 33804e6893..fabadcd7a2 100644
                          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c0ec288c05..1254bb5c8f 100644
+index 5b007f26d..403a503bc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -372,6 +372,11 @@ public class PurpurWorldConfig {

patches/server/0128-Configurable-daylight-cycle.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable daylight cycle
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index 88c3d7efaf..fed1ce9503 100644
+index 88c3d7efa..fed1ce950 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 @@ -5,7 +5,7 @@ import java.io.IOException;
@@ -18,7 +18,7 @@ index 88c3d7efaf..fed1ce9503 100644
      public PacketPlayOutUpdateTime() {}
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 644ff68795..dd8e284b26 100644
+index 644ff6879..dd8e284b2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -74,7 +74,7 @@ index 644ff68795..dd8e284b26 100644
  
      public void doMobSpawning(boolean flag, boolean flag1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1254bb5c8f..79e554a05e 100644
+index 403a503bc..213632534 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -116,6 +116,13 @@ public class PurpurWorldConfig {

patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow infinite and mending enchantments together
 
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
-index 408cfa4609..3d4e34f707 100644
+index 408cfa460..3d4e34f70 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
 @@ -23,6 +23,6 @@ public class EnchantmentInfiniteArrows extends Enchantment {
@@ -17,7 +17,7 @@ index 408cfa4609..3d4e34f707 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d6408629c4..2ca0707adb 100644
+index bcb9857b7..bcb397b7f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -194,6 +194,16 @@ public class PurpurConfig {

patches/server/0130-Infinite-fuel-furnace.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Infinite fuel furnace
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 1d3c2dd936..1a47f0ae48 100644
+index 1d3c2dd93..1a47f0ae4 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -266,6 +266,22 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -41,7 +41,7 @@ index 1d3c2dd936..1a47f0ae48 100644
  
          if (flag1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 79e554a05e..6adcce6174 100644
+index 213632534..1dea0f8c0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -340,6 +340,11 @@ public class PurpurWorldConfig {

patches/server/0131-Arrows-should-not-reset-despawn-counter.patch

@@ -7,7 +7,7 @@ This prevents keeping arrows alive indefinitely (such as when the block
 the arrow is stuck in gets removed, like a piston head going up/down)
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 7f89b269e3..5ec8c9484d 100644
+index 7f89b269e..5ec8c9484 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -243,7 +243,7 @@ public abstract class EntityArrow extends IProjectile {

patches/server/0132-Add-tablist-suffix-option-for-afk.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add tablist suffix option for afk
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b5f6a98fe4..5dd2c4036e 100644
+index b5f6a98fe..5dd2c4036 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1959,7 +1959,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -22,7 +22,7 @@ index b5f6a98fe4..5dd2c4036e 100644
  
          ((WorldServer) world).everyoneSleeping();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2ca0707adb..adfd90c5b7 100644
+index bcb397b7f..1b9046f50 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,12 +133,14 @@ public class PurpurConfig {

patches/server/0133-Ability-to-re-add-farmland-mechanics-from-Alpha.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to re-add farmland mechanics from Alpha
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
-index 8dd48669c2..099e0d3df2 100644
+index 8dd48669c..099e0d3df 100644
 --- a/src/main/java/net/minecraft/server/BlockSoil.java
 +++ b/src/main/java/net/minecraft/server/BlockSoil.java
 @@ -90,6 +90,14 @@ public class BlockSoil extends Block {
@@ -24,7 +24,7 @@ index 8dd48669c2..099e0d3df2 100644
                  return;
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6adcce6174..b01c7018ba 100644
+index 1dea0f8c0..90368559d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -336,8 +336,10 @@ public class PurpurWorldConfig {

patches/server/0134-Add-adjustable-breeding-cooldown-to-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add adjustable breeding cooldown to config
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java
-index bba343542e..d9f9e2235d 100644
+index bba343542..d9f9e2235 100644
 --- a/src/main/java/net/minecraft/server/EntityAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityAnimal.java
 @@ -120,7 +120,7 @@ public abstract class EntityAnimal extends EntityAgeable {
@@ -33,7 +33,7 @@ index bba343542e..d9f9e2235d 100644
              int experience = this.getRandom().nextInt(7) + 1;
              org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, entityanimal, entityplayer, this.breedItem, experience);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ab97d076c9..b4ba9b56a9 100644
+index ab97d076c..b4ba9b56a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -104,6 +104,48 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -94,7 +94,7 @@ index ab97d076c9..b4ba9b56a9 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b01c7018ba..6bf867483c 100644
+index 90368559d..a108545c7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -202,6 +202,7 @@ public class PurpurWorldConfig {
@@ -114,7 +114,7 @@ index b01c7018ba..6bf867483c 100644
  
      public boolean catSpawning;
 diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
-index 4904be939c..860d07cd68 100644
+index 4904be939..860d07cd6 100644
 --- a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 @@ -49,6 +49,7 @@ public class PurpurCommand extends Command {

patches/server/0135-Make-animal-breeding-times-configurable.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make animal breeding times configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java
-index d9f9e2235d..dd6725debe 100644
+index d9f9e2235..dd6725deb 100644
 --- a/src/main/java/net/minecraft/server/EntityAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityAnimal.java
 @@ -13,6 +13,7 @@ public abstract class EntityAnimal extends EntityAgeable {
@@ -30,7 +30,7 @@ index d9f9e2235d..dd6725debe 100644
              entityanimal.resetLove();
              entityageable.setBaby(true);
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index d8354ec4d1..ded4e10f50 100644
+index d8354ec4d..ded4e10f5 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -100,6 +100,11 @@ public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityB
@@ -46,7 +46,7 @@ index d8354ec4d1..ded4e10f50 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index 05929d5c53..a6ce4ca27c 100644
+index 05929d5c5..a6ce4ca27 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -58,6 +58,11 @@ public class EntityCat extends EntityTameableAnimal {
@@ -62,7 +62,7 @@ index 05929d5c53..a6ce4ca27c 100644
  
      public MinecraftKey eU() {
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index a16ecd7edc..26f7833496 100644
+index a16ecd7ed..26f783349 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -36,6 +36,11 @@ public class EntityChicken extends EntityAnimal {
@@ -78,7 +78,7 @@ index a16ecd7edc..26f7833496 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 1219b0aa9c..63497ca026 100644
+index 1219b0aa9..63497ca02 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -21,6 +21,11 @@ public class EntityCow extends EntityAnimal {
@@ -94,7 +94,7 @@ index 1219b0aa9c..63497ca026 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index f5defe4713..e87f5aeb97 100644
+index f5defe471..e87f5aeb9 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -86,6 +86,11 @@ public class EntityFox extends EntityAnimal {
@@ -110,7 +110,7 @@ index f5defe4713..e87f5aeb97 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java
-index 548ff4449f..a1578aade4 100644
+index 548ff4449..a1578aade 100644
 --- a/src/main/java/net/minecraft/server/EntityHoglin.java
 +++ b/src/main/java/net/minecraft/server/EntityHoglin.java
 @@ -30,6 +30,11 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin {
@@ -126,7 +126,7 @@ index 548ff4449f..a1578aade4 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index 0415a4d1f3..b19995f962 100644
+index 0415a4d1f..b19995f96 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -17,6 +17,11 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -142,7 +142,7 @@ index 0415a4d1f3..b19995f962 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index cb8aee5691..f6421bb45c 100644
+index cb8aee569..f6421bb45 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 @@ -13,6 +13,11 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -158,7 +158,7 @@ index cb8aee5691..f6421bb45c 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java
-index 243aeb736e..30cbc505d2 100644
+index 243aeb736..30cbc505d 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java
 @@ -13,6 +13,11 @@ public class EntityHorseMule extends EntityHorseChestedAbstract {
@@ -174,7 +174,7 @@ index 243aeb736e..30cbc505d2 100644
      @Override
      protected SoundEffect getSoundAmbient() {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index e2c6a5807a..408db52cac 100644
+index e2c6a5807..408db52ca 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -22,6 +22,11 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -190,7 +190,7 @@ index e2c6a5807a..408db52cac 100644
  
      public static AttributeProvider.Builder eL() {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index 559ba50977..2121a6c979 100644
+index 559ba5097..2121a6c97 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
 @@ -18,6 +18,11 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -206,7 +206,7 @@ index 559ba50977..2121a6c979 100644
  
      public static AttributeProvider.Builder eL() {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 1099277868..3bc6e6df9e 100644
+index 109927786..3bc6e6df9 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -57,6 +57,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -222,7 +222,7 @@ index 1099277868..3bc6e6df9e 100644
  
      public void setStrength(int i) {
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 7966b34f8d..eb1f95d8ba 100644
+index 7966b34f8..eb1f95d8b 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -30,6 +30,11 @@ public class EntityMushroomCow extends EntityCow implements IShearable {
@@ -238,7 +238,7 @@ index 7966b34f8d..eb1f95d8ba 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 2f8275cd6b..a5be10dfb0 100644
+index 2f8275cd6..a5be10dfb 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -26,6 +26,11 @@ public class EntityOcelot extends EntityAnimal {
@@ -254,7 +254,7 @@ index 2f8275cd6b..a5be10dfb0 100644
  
      private boolean isTrusting() {
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index eafae5516b..c70180fddb 100644
+index eafae5516..c70180fdd 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -65,6 +65,11 @@ public class EntityPanda extends EntityAnimal {
@@ -270,7 +270,7 @@ index eafae5516b..c70180fddb 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index e402d4a77b..398e92bf70 100644
+index e402d4a77..398e92bf7 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -115,6 +115,11 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -286,7 +286,7 @@ index e402d4a77b..398e92bf70 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index dade0bb294..7172e8cabf 100644
+index dade0bb29..7172e8cab 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -29,6 +29,11 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
@@ -302,7 +302,7 @@ index dade0bb294..7172e8cabf 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 3d649843f5..40395dd7ea 100644
+index 3d649843f..40395dd7e 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -67,6 +67,11 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
@@ -318,7 +318,7 @@ index 3d649843f5..40395dd7ea 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index b766a27e98..654cd036a8 100644
+index b766a27e9..654cd036a 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -30,6 +30,11 @@ public class EntityRabbit extends EntityAnimal {
@@ -334,7 +334,7 @@ index b766a27e98..654cd036a8 100644
  
      // CraftBukkit start - code from constructor
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index a151d4295c..32130c0681 100644
+index a151d4295..32130c068 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -66,6 +66,11 @@ public class EntitySheep extends EntityAnimal implements IShearable {
@@ -350,7 +350,7 @@ index a151d4295c..32130c0681 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java
-index 172867f50d..9ab1b5af68 100644
+index 172867f50..9ab1b5af6 100644
 --- a/src/main/java/net/minecraft/server/EntityStrider.java
 +++ b/src/main/java/net/minecraft/server/EntityStrider.java
 @@ -38,6 +38,11 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab
@@ -366,7 +366,7 @@ index 172867f50d..9ab1b5af68 100644
  
      public static boolean c(EntityTypes<EntityStrider> entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 2b34e6cf3b..067f7f28b0 100644
+index 2b34e6cf3..067f7f28b 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -37,6 +37,11 @@ public class EntityTurtle extends EntityAnimal {
@@ -382,7 +382,7 @@ index 2b34e6cf3b..067f7f28b0 100644
  
      public void setHomePos(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 9ae7168595..6c25f667ee 100644
+index 9ae716859..6c25f667e 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -48,6 +48,11 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
@@ -398,7 +398,7 @@ index 9ae7168595..6c25f667ee 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6bf867483c..58a880f7cb 100644
+index a108545c7..992a0babb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -423,10 +423,12 @@ public class PurpurWorldConfig {
@@ -466,7 +466,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean drownedRidable = false;
-@@ -569,10 +579,12 @@ public class PurpurWorldConfig {
+@@ -567,10 +577,12 @@ public class PurpurWorldConfig {
      public boolean foxRidable = false;
      public boolean foxRidableInWater = false;
      public boolean foxTypeChangesWithTulips = false;
@@ -479,7 +479,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean ghastRidable = false;
-@@ -612,14 +624,18 @@ public class PurpurWorldConfig {
+@@ -615,14 +627,18 @@ public class PurpurWorldConfig {
  
      public boolean hoglinRidable = false;
      public boolean hoglinRidableInWater = false;
@@ -498,7 +498,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean huskRidable = false;
-@@ -659,9 +675,11 @@ public class PurpurWorldConfig {
+@@ -667,9 +683,11 @@ public class PurpurWorldConfig {
  
      public boolean llamaRidable = false;
      public boolean llamaRidableInWater = false;
@@ -510,7 +510,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean llamaTraderRidable = false;
-@@ -680,28 +698,36 @@ public class PurpurWorldConfig {
+@@ -688,28 +706,36 @@ public class PurpurWorldConfig {
  
      public boolean mooshroomRidable = false;
      public boolean mooshroomRidableInWater = false;
@@ -547,7 +547,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean parrotRidable = false;
-@@ -765,10 +791,12 @@ public class PurpurWorldConfig {
+@@ -773,10 +799,12 @@ public class PurpurWorldConfig {
      public boolean pigRidable = false;
      public boolean pigRidableInWater = false;
      public boolean pigGiveSaddleBack = false;
@@ -560,7 +560,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean piglinRidable = false;
-@@ -796,12 +824,14 @@ public class PurpurWorldConfig {
+@@ -804,12 +832,14 @@ public class PurpurWorldConfig {
      public boolean polarBearRidableInWater = false;
      public String polarBearBreedableItemString = "";
      public Item polarBearBreedableItem = null;
@@ -575,7 +575,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean pufferfishRidable = false;
-@@ -813,11 +843,13 @@ public class PurpurWorldConfig {
+@@ -821,11 +851,13 @@ public class PurpurWorldConfig {
      public boolean rabbitRidableInWater = false;
      public double rabbitNaturalToast = 0.0D;
      public double rabbitNaturalKiller = 0.0D;
@@ -589,7 +589,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean ravagerRidable = false;
-@@ -834,9 +866,11 @@ public class PurpurWorldConfig {
+@@ -842,9 +874,11 @@ public class PurpurWorldConfig {
  
      public boolean sheepRidable = false;
      public boolean sheepRidableInWater = false;
@@ -601,7 +601,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean shulkerRidable = false;
-@@ -914,9 +948,11 @@ public class PurpurWorldConfig {
+@@ -922,9 +956,11 @@ public class PurpurWorldConfig {
  
      public boolean striderRidable = false;
      public boolean striderRidableInWater = false;
@@ -613,7 +613,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean tropicalFishRidable = false;
-@@ -926,9 +962,11 @@ public class PurpurWorldConfig {
+@@ -934,9 +970,11 @@ public class PurpurWorldConfig {
  
      public boolean turtleRidable = false;
      public boolean turtleRidableInWater = false;
@@ -625,7 +625,7 @@ index 6bf867483c..58a880f7cb 100644
      }
  
      public boolean vexRidable = false;
-@@ -1016,9 +1054,11 @@ public class PurpurWorldConfig {
+@@ -1029,9 +1067,11 @@ public class PurpurWorldConfig {
  
      public boolean wolfRidable = false;
      public boolean wolfRidableInWater = false;

patches/server/0136-Apply-display-names-from-item-forms-of-entities-to-e.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index df3fc83029..a75de169fe 100644
+index df3fc8302..a75de169f 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -546,7 +546,13 @@ public class EntityArmorStand extends EntityLiving {
@@ -25,7 +25,7 @@ index df3fc83029..a75de169fe 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index d53bbe3169..bc558c54c9 100644
+index d53bbe316..bc558c54c 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -155,7 +155,13 @@ public class EntityBoat extends Entity {
@@ -52,7 +52,7 @@ index d53bbe3169..bc558c54c9 100644
          switch (this.getType()) {
              case OAK:
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 80589799ab..2fef696732 100644
+index 80589799a..2fef69673 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1368,7 +1368,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -86,7 +86,7 @@ index 80589799ab..2fef696732 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 16c8f2cdf7..19460d8856 100644
+index 16c8f2cdf..19460d885 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -199,7 +199,13 @@ public class EntityItemFrame extends EntityHanging {
@@ -105,7 +105,7 @@ index 16c8f2cdf7..19460d8856 100644
  
                  if (!itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java
-index 4b7cd7c59f..d01fc8b110 100644
+index 4b7cd7c59..d01fc8b11 100644
 --- a/src/main/java/net/minecraft/server/EntityPainting.java
 +++ b/src/main/java/net/minecraft/server/EntityPainting.java
 @@ -92,7 +92,13 @@ public class EntityPainting extends EntityHanging {
@@ -124,7 +124,7 @@ index 4b7cd7c59f..d01fc8b110 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
-index c9a5d3b583..315faee9e3 100644
+index c9a5d3b58..315faee9e 100644
 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java
 +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
 @@ -43,6 +43,14 @@ public class ItemArmorStand extends Item {
@@ -143,7 +143,7 @@ index c9a5d3b583..315faee9e3 100644
                      world.playSound((EntityHuman) null, entityarmorstand.locX(), entityarmorstand.locY(), entityarmorstand.locZ(), SoundEffects.ENTITY_ARMOR_STAND_PLACE, SoundCategory.BLOCKS, 0.75F, 0.8F);
                  }
 diff --git a/src/main/java/net/minecraft/server/ItemBoat.java b/src/main/java/net/minecraft/server/ItemBoat.java
-index 0580ce55ec..6183da7ad2 100644
+index 0580ce55e..6183da7ad 100644
 --- a/src/main/java/net/minecraft/server/ItemBoat.java
 +++ b/src/main/java/net/minecraft/server/ItemBoat.java
 @@ -52,6 +52,11 @@ public class ItemBoat extends Item {
@@ -159,7 +159,7 @@ index 0580ce55ec..6183da7ad2 100644
                      return InteractionResultWrapper.fail(itemstack);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/ItemHanging.java b/src/main/java/net/minecraft/server/ItemHanging.java
-index a3eaeeda87..f2f800087a 100644
+index a3eaeeda8..f2f800087 100644
 --- a/src/main/java/net/minecraft/server/ItemHanging.java
 +++ b/src/main/java/net/minecraft/server/ItemHanging.java
 @@ -26,7 +26,7 @@ public class ItemHanging extends Item {
@@ -184,7 +184,7 @@ index a3eaeeda87..f2f800087a 100644
  
              if (((EntityHanging) object).survives()) {
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 40f553e395..7161eba52e 100644
+index 40f553e39..7161eba52 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -738,6 +738,7 @@ public final class ItemStack {
@@ -196,7 +196,7 @@ index 40f553e395..7161eba52e 100644
          NBTTagCompound nbttagcompound = this.a("display");
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 58a880f7cb..8525741575 100644
+index 992a0babb..af3f910e6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -83,8 +83,10 @@ public class PurpurWorldConfig {

patches/server/0137-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Set name visible when using a Name Tag on an Armor Stand
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemNameTag.java b/src/main/java/net/minecraft/server/ItemNameTag.java
-index 01163ce386..a7efce9731 100644
+index 01163ce38..a7efce973 100644
 --- a/src/main/java/net/minecraft/server/ItemNameTag.java
 +++ b/src/main/java/net/minecraft/server/ItemNameTag.java
 @@ -11,6 +11,11 @@ public class ItemNameTag extends Item {
@@ -21,7 +21,7 @@ index 01163ce386..a7efce9731 100644
                      ((EntityInsentient) entityliving).setPersistent();
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8525741575..b7fe9865d5 100644
+index af3f910e6..a77debc7a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -84,9 +84,11 @@ public class PurpurWorldConfig {

patches/server/0138-Add-twisting-and-weeping-vines-growth-rates.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add twisting and weeping vines growth rates
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java
-index 7963411be9..6c084ad5cd 100644
+index 7963411be..6c084ad5c 100644
 --- a/src/main/java/net/minecraft/server/BlockGrowingTop.java
 +++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java
 @@ -23,9 +23,11 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB
@@ -22,7 +22,7 @@ index 7963411be9..6c084ad5cd 100644
  
              if (this.h(worldserver.getType(blockposition1))) {
 diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java
-index a243aaed58..2a7a6e5943 100644
+index a243aaed5..2a7a6e594 100644
 --- a/src/main/java/net/minecraft/server/BlockKelp.java
 +++ b/src/main/java/net/minecraft/server/BlockKelp.java
 @@ -53,4 +53,10 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer {
@@ -37,7 +37,7 @@ index a243aaed58..2a7a6e5943 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java
-index be38167463..146638111c 100644
+index be3816746..146638111 100644
 --- a/src/main/java/net/minecraft/server/BlockTwistingVines.java
 +++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java
 @@ -24,4 +24,10 @@ public class BlockTwistingVines extends BlockGrowingTop {
@@ -52,7 +52,7 @@ index be38167463..146638111c 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java
-index 23dca19403..94ffadb91f 100644
+index 23dca1940..94ffadb91 100644
 --- a/src/main/java/net/minecraft/server/BlockWeepingVines.java
 +++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java
 @@ -24,4 +24,10 @@ public class BlockWeepingVines extends BlockGrowingTop {
@@ -67,7 +67,7 @@ index 23dca19403..94ffadb91f 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b7fe9865d5..7d4e84bb85 100644
+index a77debc7a..a7eb31a3e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -408,6 +408,16 @@ public class PurpurWorldConfig {

patches/server/0139-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Kelp weeping and twisting vines configurable max growth age
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java
-index 6c084ad5cd..6d49422c33 100644
+index 6c084ad5c..6d49422c3 100644
 --- a/src/main/java/net/minecraft/server/BlockGrowingTop.java
 +++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java
 @@ -15,7 +15,7 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB
@@ -47,7 +47,7 @@ index 6c084ad5cd..6d49422c33 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java
-index 2a7a6e5943..b35c115e34 100644
+index 2a7a6e594..b35c115e3 100644
 --- a/src/main/java/net/minecraft/server/BlockKelp.java
 +++ b/src/main/java/net/minecraft/server/BlockKelp.java
 @@ -58,5 +58,9 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer {
@@ -61,7 +61,7 @@ index 2a7a6e5943..b35c115e34 100644
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java
-index 146638111c..71b9b7183d 100644
+index 146638111..71b9b7183 100644
 --- a/src/main/java/net/minecraft/server/BlockTwistingVines.java
 +++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java
 @@ -29,5 +29,9 @@ public class BlockTwistingVines extends BlockGrowingTop {
@@ -75,7 +75,7 @@ index 146638111c..71b9b7183d 100644
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java
-index 94ffadb91f..067df63ab2 100644
+index 94ffadb91..067df63ab 100644
 --- a/src/main/java/net/minecraft/server/BlockWeepingVines.java
 +++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java
 @@ -29,5 +29,9 @@ public class BlockWeepingVines extends BlockGrowingTop {
@@ -89,7 +89,7 @@ index 94ffadb91f..067df63ab2 100644
      // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7d4e84bb85..3ed6fbed70 100644
+index a7eb31a3e..9b91ae118 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -355,6 +355,11 @@ public class PurpurWorldConfig {

patches/server/0140-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch

@@ -8,7 +8,7 @@ This should help to reduce the amount of dirt, gravel, grass, and etc.
 that Endermen like to randomly place all over the world.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 995849212c..acb2b3ed04 100644
+index 995849212..acb2b3ed0 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -372,7 +372,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -21,10 +21,10 @@ index 995849212c..acb2b3ed04 100644
  
      static class PathfinderGoalEndermanPickupBlock extends PathfinderGoal {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3ed6fbed70..8f0be34937 100644
+index 9b91ae118..d14a4955e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -581,10 +581,12 @@ public class PurpurWorldConfig {
+@@ -579,10 +579,12 @@ public class PurpurWorldConfig {
      public boolean endermanRidable = false;
      public boolean endermanRidableInWater = false;
      public boolean endermanAllowGriefing = true;

patches/server/0141-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index deb6c93426..84e500fa7f 100644
+index deb6c9342..84e500fa7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -73,6 +73,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -33,7 +33,7 @@ index deb6c93426..84e500fa7f 100644
                      if (flag5) {
                          if (i > 0) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a17f449b54..110db570c8 100644
+index a17f449b5..110db570c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1048,7 +1048,7 @@ public class CraftEventFactory {

patches/server/0142-Add-configurable-snowball-damage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable snowball damage
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowball.java b/src/main/java/net/minecraft/server/EntitySnowball.java
-index 34a5f481e6..d7bab4446a 100644
+index 34a5f481e..d7bab4446 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowball.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowball.java
 @@ -29,7 +29,7 @@ public class EntitySnowball extends EntityProjectileThrowable {
@@ -18,7 +18,7 @@ index 34a5f481e6..d7bab4446a 100644
          entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8f0be34937..8d4fc335b8 100644
+index d14a4955e..effcabfd6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -196,6 +196,11 @@ public class PurpurWorldConfig {

patches/server/0143-Zombie-break-door-minimum-difficulty-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie break door minimum difficulty option
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java
-index 7488a12926..23870a271b 100644
+index 7488a1292..23870a271 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java
 @@ -13,7 +13,7 @@ public class PathfinderGoalBreakDoor extends PathfinderGoalDoorInteract {
@@ -40,7 +40,7 @@ index 7488a12926..23870a271b 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8d4fc335b8..841f744395 100644
+index effcabfd6..ee7b5efcf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2,6 +2,7 @@ package net.pl3x.purpur;
@@ -51,7 +51,7 @@ index 8d4fc335b8..841f744395 100644
  import net.minecraft.server.Explosion;
  import net.minecraft.server.IRegistry;
  import net.minecraft.server.Item;
-@@ -1106,6 +1107,7 @@ public class PurpurWorldConfig {
+@@ -1119,6 +1120,7 @@ public class PurpurWorldConfig {
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -59,7 +59,7 @@ index 8d4fc335b8..841f744395 100644
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1113,6 +1115,11 @@ public class PurpurWorldConfig {
+@@ -1126,6 +1128,11 @@ public class PurpurWorldConfig {
          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);

patches/server/0144-Add-demo-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 1a13eb47e0..ccd0be059f 100644
+index 1a13eb47e..ccd0be059 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -107,6 +107,7 @@ public class CommandDispatcher {
@@ -17,7 +17,7 @@ index 1a13eb47e0..ccd0be059f 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java b/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java
-index 08cbc787e2..57d39ed441 100644
+index 08cbc787e..57d39ed44 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutGameStateChange.java
 @@ -11,7 +11,7 @@ public class PacketPlayOutGameStateChange implements Packet<PacketListenerPlayOu
@@ -30,7 +30,7 @@ index 08cbc787e2..57d39ed441 100644
      public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7);
      public static final PacketPlayOutGameStateChange.a i = new PacketPlayOutGameStateChange.a(8);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index adfd90c5b7..06e40ffed1 100644
+index 1b9046f50..deb82f76a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -134,6 +134,7 @@ public class PurpurConfig {
@@ -51,7 +51,7 @@ index adfd90c5b7..06e40ffed1 100644
      }
 diff --git a/src/main/java/net/pl3x/purpur/command/DemoCommand.java b/src/main/java/net/pl3x/purpur/command/DemoCommand.java
 new file mode 100644
-index 0000000000..7640ce18b8
+index 000000000..7640ce18b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/DemoCommand.java
 @@ -0,0 +1,39 @@

patches/server/0145-Left-handed-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Left handed API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index eaad222fd3..eb1d0d8e89 100644
+index eaad222fd..eb1d0d8e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -85,4 +85,14 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {

patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Origami - Fix ProtocolLib issues on Java 15
 
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 7a2a8acea9..8a452173c0 100644
+index 7a2a8acea..8a452173c 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -392,9 +392,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {

patches/server/0147-Changeable-Mob-Left-Handed-Chance.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 2fef696732..e2d7c20e66 100644
+index 2fef69673..e2d7c20e6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1135,7 +1135,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index 2fef696732..e2d7c20e66 100644
          } else {
              this.setLeftHanded(false);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 841f744395..673c2e5f18 100644
+index ee7b5efcf..090a8c681 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -129,8 +129,10 @@ public class PurpurWorldConfig {

patches/server/0148-Add-boat-fall-damage-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5dd2c4036e..50ea875a3b 100644
+index 5dd2c4036..50ea875a3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1017,7 +1017,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -27,7 +27,7 @@ index 5dd2c4036e..50ea875a3b 100644
  
              if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 673c2e5f18..d1f6c05924 100644
+index 090a8c681..1e5dc4366 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -206,6 +206,7 @@ public class PurpurWorldConfig {

patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk ->
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 06e40ffed1..3c4c099beb 100644
+index deb82f76a..d01982330 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,7 @@
@@ -36,7 +36,7 @@ index 06e40ffed1..3c4c099beb 100644
      public static String afkBroadcastBack = "§e§o%s is no longer AFK";
      public static String afkTabListPrefix = "[AFK] ";
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d1f6c05924..1f8d05672a 100644
+index 1e5dc4366..d2c07bd07 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,5 +1,6 @@

patches/server/0150-Snow-Golem-rate-of-fire-config.patch

@@ -10,7 +10,7 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
 0, snow golems won't shoot any snowballs.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index e980da14cf..e5b3d298f5 100644
+index e980da14c..e5b3d298f 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -29,7 +29,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -23,10 +23,10 @@ index e980da14cf..e5b3d298f5 100644
          this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
          this.goalSelector.a(4, new PathfinderGoalRandomLookaround(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1f8d05672a..301f32f8b0 100644
+index d2c07bd07..7f40f1187 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -962,12 +962,20 @@ public class PurpurWorldConfig {
+@@ -970,12 +970,20 @@ public class PurpurWorldConfig {
      public boolean snowGolemLeaveTrailWhenRidden = false;
      public boolean snowGolemDropsPumpkin = false;
      public boolean snowGolemPutPumpkinBack = false;

patches/server/0151-PaperPR-Apply-advancements-async.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Apply advancements async
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index eaa1063ff2..a3b89a4f2a 100644
+index eaa1063ff..a3b89a4f2 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -63,6 +63,7 @@ public class AdvancementDataPlayer {
@@ -17,7 +17,7 @@ index eaa1063ff2..a3b89a4f2a 100644
          this.player = entityplayer;
      }
 diff --git a/src/main/java/net/minecraft/server/CriterionProgress.java b/src/main/java/net/minecraft/server/CriterionProgress.java
-index 98c3884f47..244b58a7c4 100644
+index 98c3884f4..244b58a7c 100644
 --- a/src/main/java/net/minecraft/server/CriterionProgress.java
 +++ b/src/main/java/net/minecraft/server/CriterionProgress.java
 @@ -10,8 +10,9 @@ import java.util.Date;
@@ -51,7 +51,7 @@ index 98c3884f47..244b58a7c4 100644
          } catch (ParseException parseexception) {
              throw new JsonSyntaxException("Invalid datetime: " + s, parseexception);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 50ea875a3b..cc6a54e06a 100644
+index 50ea875a3..cc6a54e06 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -49,7 +49,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -111,7 +111,7 @@ index 50ea875a3b..cc6a54e06a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fd75444cec..95d93cd8e5 100644
+index fd75444ce..95d93cd8e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2315,6 +2315,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -123,7 +123,7 @@ index fd75444cec..95d93cd8e5 100644
          return this.convertable.getWorldFolder(savedfile);
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7b385eb43e..eae19141e3 100644
+index 7b385eb43..eae19141e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1339,9 +1339,26 @@ public abstract class PlayerList {

patches/server/0152-PaperPR-Config-option-for-Piglins-guarding-chests.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2452f54d96..3ff2fa66b9 100644
+index 2452f54d9..3ff2fa66b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -669,6 +669,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 2452f54d96..3ff2fa66b9 100644
      private void useEigencraftRedstone() {
          useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false);
 diff --git a/src/main/java/net/minecraft/server/PiglinAI.java b/src/main/java/net/minecraft/server/PiglinAI.java
-index 0407fa1751..df5aafec9a 100644
+index 0407fa175..df5aafec9 100644
 --- a/src/main/java/net/minecraft/server/PiglinAI.java
 +++ b/src/main/java/net/minecraft/server/PiglinAI.java
 @@ -357,6 +357,7 @@ public class PiglinAI {

patches/server/0153-EMC-Configurable-disable-give-dropping.patch

@@ -8,7 +8,7 @@ purpur.yml to disable the /give command from dropping items on the
 floor when a player's inventory is full.
 
 diff --git a/src/main/java/net/minecraft/server/CommandGive.java b/src/main/java/net/minecraft/server/CommandGive.java
-index 1d22c45af8..7bf90f27fd 100644
+index 1d22c45af..7bf90f27f 100644
 --- a/src/main/java/net/minecraft/server/CommandGive.java
 +++ b/src/main/java/net/minecraft/server/CommandGive.java
 @@ -35,6 +35,7 @@ public class CommandGive {
@@ -20,7 +20,7 @@ index 1d22c45af8..7bf90f27fd 100644
                      itemstack.setCount(1);
                      entityitem = entityplayer.drop(itemstack, false);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3c4c099beb..de0776f8cd 100644
+index d01982330..db61ab72e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -188,6 +188,11 @@ public class PurpurConfig {

patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index de0776f8cd..674d06bfb3 100644
+index db61ab72e..179143400 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -142,6 +142,17 @@ public class PurpurConfig {
@@ -28,7 +28,7 @@ index de0776f8cd..674d06bfb3 100644
      public static String afkBroadcastBack = "§e§o%s is no longer AFK";
      public static String afkTabListPrefix = "[AFK] ";
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 301f32f8b0..6b80bc373f 100644
+index 7f40f1187..f57d0e48f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -96,6 +96,17 @@ public class PurpurWorldConfig {

patches/server/0155-Lobotomize-stuck-villagers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 13227c558b..330ac6cf85 100644
+index 13227c558..330ac6cf8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -114,7 +114,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 13227c558b..330ac6cf85 100644
      public float yaw;
      public float pitch;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 166a8f9a7f..96cfc0c5c3 100644
+index 166a8f9a7..96cfc0c5c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -187,15 +187,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -59,7 +59,7 @@ index 166a8f9a7f..96cfc0c5c3 100644
          long i = this.bC + 12000L;
          long j = this.world.getTime();
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index b92ca4a6de..1208464fba 100644
+index b92ca4a6d..1208464fb 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -101,6 +101,7 @@ public abstract class NavigationAbstract {
@@ -71,10 +71,10 @@ index b92ca4a6de..1208464fba 100644
          // Paper start - add target parameter
          return this.a(blockposition, null, i);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6b80bc373f..092edac7d3 100644
+index f57d0e48f..bd7123842 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1056,6 +1056,7 @@ public class PurpurWorldConfig {
+@@ -1064,6 +1064,7 @@ public class PurpurWorldConfig {
      public int villagerSpawnIronGolemRadius = 0;
      public int villagerSpawnIronGolemLimit = 0;
      public boolean villagerCanBreed = true;
@@ -82,7 +82,7 @@ index 6b80bc373f..092edac7d3 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1067,6 +1068,7 @@ public class PurpurWorldConfig {
+@@ -1075,6 +1076,7 @@ public class PurpurWorldConfig {
          villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);

patches/server/0156-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch

@@ -8,7 +8,7 @@ farm Nether Wart. Reimplemented based on a feature of the carpet-extra
 mod.
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java
-index 0ff202c0d7..b9c6011c8d 100644
+index 0ff202c0d..b9c6011c8 100644
 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java
 +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java
 @@ -12,6 +12,7 @@ public class BehaviorFarm extends Behavior<EntityVillager> {
@@ -88,7 +88,7 @@ index 0ff202c0d7..b9c6011c8d 100644
                              if (itemstack.isEmpty()) {
                                  inventorysubcontainer.setItem(j, ItemStack.b);
 diff --git a/src/main/java/net/minecraft/server/BehaviorTradeVillager.java b/src/main/java/net/minecraft/server/BehaviorTradeVillager.java
-index ad26ecd7fe..6d8b6951c3 100644
+index ad26ecd7f..6d8b6951c 100644
 --- a/src/main/java/net/minecraft/server/BehaviorTradeVillager.java
 +++ b/src/main/java/net/minecraft/server/BehaviorTradeVillager.java
 @@ -41,6 +41,11 @@ public class BehaviorTradeVillager extends Behavior<EntityVillager> {
@@ -112,7 +112,7 @@ index ad26ecd7fe..6d8b6951c3 100644
          InventorySubcontainer inventorysubcontainer = entityvillager.getInventory();
          ItemStack itemstack = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/Behaviors.java b/src/main/java/net/minecraft/server/Behaviors.java
-index 2d91869660..e376306bc2 100644
+index 2d9186966..e376306bc 100644
 --- a/src/main/java/net/minecraft/server/Behaviors.java
 +++ b/src/main/java/net/minecraft/server/Behaviors.java
 @@ -12,10 +12,13 @@ public class Behaviors {
@@ -133,7 +133,7 @@ index 2d91869660..e376306bc2 100644
          } else {
              object = new BehaviorWork();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 96cfc0c5c3..f0a5708f01 100644
+index 96cfc0c5c..f0a5708f0 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -131,7 +131,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -170,7 +170,7 @@ index 96cfc0c5c3..f0a5708f01 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/IInventory.java b/src/main/java/net/minecraft/server/IInventory.java
-index 46b88056b8..64f1767f66 100644
+index 46b88056b..64f1767f6 100644
 --- a/src/main/java/net/minecraft/server/IInventory.java
 +++ b/src/main/java/net/minecraft/server/IInventory.java
 @@ -31,6 +31,7 @@ public interface IInventory extends Clearable {
@@ -190,7 +190,7 @@ index 46b88056b8..64f1767f66 100644
          for (int i = 0; i < this.getSize(); ++i) {
              ItemStack itemstack = this.getItem(i);
 diff --git a/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java b/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java
-index 24173f0d3a..2d8e3e7771 100644
+index 24173f0d3..2d8e3e777 100644
 --- a/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java
 +++ b/src/main/java/net/minecraft/server/SensorSecondaryPlaces.java
 @@ -12,6 +12,13 @@ public class SensorSecondaryPlaces extends Sensor<EntityVillager> {
@@ -221,7 +221,7 @@ index 24173f0d3a..2d8e3e7771 100644
              behaviorcontroller.removeMemory(MemoryModuleType.SECONDARY_JOB_SITE);
          }
 diff --git a/src/main/java/net/minecraft/server/VillagerProfession.java b/src/main/java/net/minecraft/server/VillagerProfession.java
-index 3c60da7ac6..6493f220a0 100644
+index 3c60da7ac..6493f220a 100644
 --- a/src/main/java/net/minecraft/server/VillagerProfession.java
 +++ b/src/main/java/net/minecraft/server/VillagerProfession.java
 @@ -9,7 +9,7 @@ public class VillagerProfession {
@@ -234,10 +234,10 @@ index 3c60da7ac6..6493f220a0 100644
      public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN);
      public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 092edac7d3..130c973f60 100644
+index bd7123842..7c740f643 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1057,6 +1057,8 @@ public class PurpurWorldConfig {
+@@ -1065,6 +1065,8 @@ public class PurpurWorldConfig {
      public int villagerSpawnIronGolemLimit = 0;
      public boolean villagerCanBreed = true;
      public boolean villagerLobotomize1x1 = false;
@@ -246,7 +246,7 @@ index 092edac7d3..130c973f60 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1069,6 +1071,8 @@ public class PurpurWorldConfig {
+@@ -1077,6 +1079,8 @@ public class PurpurWorldConfig {
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
          villagerLobotomize1x1 = getBoolean("mobs.villager.lobotomize-1x1", villagerLobotomize1x1);

patches/server/0157-Toggle-for-Zombified-Piglin-death-always-counting-as.patch

@@ -13,7 +13,7 @@ to the Piglin being angry, even though the player never hit them.
 This patch adds a toggle to disable this behavior.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 3327dbbf87..57f3358b8d 100644
+index 3327dbbf8..57f3358b8 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -95,7 +95,7 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable {
@@ -35,10 +35,10 @@ index 3327dbbf87..57f3358b8d 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 130c973f60..4264d9d1ec 100644
+index 7c740f643..f24e12718 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1177,12 +1177,14 @@ public class PurpurWorldConfig {
+@@ -1190,12 +1190,14 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyOnlyBaby = true;
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;

patches/server/0158-Spread-out-and-optimise-player-list-ticks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index eae19141e3..881db63d6f 100644
+index eae19141e..881db63d6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -71,7 +71,7 @@ public abstract class PlayerList {
@@ -56,7 +56,7 @@ index eae19141e3..881db63d6f 100644
  
      public void sendAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e781ae267d..4f42bc2183 100644
+index e781ae267..4f42bc218 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1382,7 +1382,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0159-Configurable-chance-for-Wolves-to-spawn-rabid.patch

@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ce29695c69..a5a7b426eb 100644
+index ce29695c6..a5a7b426e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2085,6 +2085,7 @@ public abstract class EntityLiving extends Entity {
@@ -19,7 +19,7 @@ index ce29695c69..a5a7b426eb 100644
          if (enumhand == EnumHand.MAIN_HAND) {
              this.setSlot(EnumItemSlot.MAINHAND, itemstack);
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 6c25f667ee..fa7f47fef9 100644
+index 6c25f667e..fa7f47fef 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -14,11 +14,42 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
@@ -170,7 +170,7 @@ index 6c25f667ee..fa7f47fef9 100644
              return super.b(entityhuman, enumhand);
          }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java
-index 9a4819815c..da29898574 100644
+index 9a4819815..da2989857 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java
 @@ -8,7 +8,7 @@ public class PathfinderGoalAvoidTarget<T extends EntityLiving> extends Pathfinde
@@ -197,10 +197,10 @@ index 9a4819815c..da29898574 100644
  
      public PathfinderGoalAvoidTarget(EntityCreature entitycreature, Class<T> oclass, Predicate<EntityLiving> predicate, float f, double d0, double d1, Predicate<EntityLiving> predicate1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4264d9d1ec..a39efcdbdc 100644
+index f24e12718..417a4b364 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1128,10 +1128,14 @@ public class PurpurWorldConfig {
+@@ -1141,10 +1141,14 @@ public class PurpurWorldConfig {
  
      public boolean wolfRidable = false;
      public boolean wolfRidableInWater = false;
@@ -216,7 +216,7 @@ index 4264d9d1ec..a39efcdbdc 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-index 5f3314febb..507857ba24 100644
+index 5f3314feb..507857ba2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
 @@ -45,4 +45,16 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {

patches/server/0160-Configurable-default-wolf-collar-color.patch

@@ -7,7 +7,7 @@ This allows for the server to set a default collar color when a wolf is tamed.
 Resets to RED when the value is invalid.
 
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index fa7f47fef9..ca38c22241 100644
+index fa7f47fef..ca38c2224 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -114,6 +114,12 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
@@ -24,7 +24,7 @@ index fa7f47fef9..ca38c22241 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a39efcdbdc..83849136ed 100644
+index 417a4b364..26ce1e69a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -3,6 +3,7 @@ package net.pl3x.purpur;
@@ -35,7 +35,7 @@ index a39efcdbdc..83849136ed 100644
  import net.minecraft.server.EnumDifficulty;
  import net.minecraft.server.Explosion;
  import net.minecraft.server.IRegistry;
-@@ -1128,12 +1129,18 @@ public class PurpurWorldConfig {
+@@ -1141,12 +1142,18 @@ public class PurpurWorldConfig {
  
      public boolean wolfRidable = false;
      public boolean wolfRidableInWater = false;