Make infinite lava number of required sources configurable

patches/server/0073-Implement-infinite-lava.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement infinite lava
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index d72a88e92..e9656641b 100644
+index d72a88e927..35d55bc15b 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -195,7 +195,7 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -13,11 +13,11 @@ index d72a88e92..e9656641b 100644
          }
  
 -        if (this.f() && j >= 2) {
-+        if (infinite(iworldreader) && j >= 2) { // Purpur
++        if (infinite(iworldreader) && j >= getRequiredSources(iworldreader)) { // Purpur
              IBlockData iblockdata2 = iworldreader.getType(blockposition.down());
              Fluid fluid1 = iblockdata2.getFluid();
  
-@@ -266,6 +266,13 @@ public abstract class FluidTypeFlowing extends FluidType {
+@@ -266,6 +266,17 @@ public abstract class FluidTypeFlowing extends FluidType {
          return (Fluid) this.e().h().set(FluidTypeFlowing.FALLING, flag);
      }
  
@@ -25,6 +25,10 @@ index d72a88e92..e9656641b 100644
 +    protected boolean infinite(IWorldReader iworldreader) {
 +        return infinite();
 +    }
++
++    protected int getRequiredSources(IWorldReader iworldreader) {
++        return 2;
++    }
 +    // Purpur end
 +
 +    protected boolean infinite() { return f(); } // Purpur - OBFHELPER
@@ -32,10 +36,10 @@ index d72a88e92..e9656641b 100644
  
      protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) {
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index 29930e801..9e543449c 100644
+index 29930e801c..ffab239192 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
-@@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
+@@ -147,6 +147,18 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
          generatoraccess.triggerEffect(1501, blockposition, 0);
      }
  
@@ -44,22 +48,29 @@ index 29930e801..9e543449c 100644
 +    protected boolean infinite(IWorldReader iworldreader) {
 +        return iworldreader.getWorldBorder().world.purpurConfig.lavaInfinite;
 +    }
++
++    @Override
++    protected int getRequiredSources(IWorldReader iworldreader) {
++        return iworldreader.getWorldBorder().world.purpurConfig.lavaInfiniteRequiredSources;
++    }
 +    // Purpur end
 +
      @Override
      protected boolean f() {
          return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 11b4eac48..3ca3de623 100644
+index 11b4eac48c..d88d120474 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -156,6 +156,11 @@ public class PurpurWorldConfig {
+@@ -156,6 +156,13 @@ public class PurpurWorldConfig {
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
      }
  
 +    public boolean lavaInfinite = false;
++    public int lavaInfiniteRequiredSources = 2;
 +    private void lavaSettings() {
 +        lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite);
++        lavaInfiniteRequiredSources = getInt("blocks.lava.infinite-required-sources", lavaInfiniteRequiredSources);
 +    }
 +
      public boolean signAllowColors = false;

patches/server/0074-Make-lava-flow-speed-configurable.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make lava flow speed configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index 9e543449c..fb501a6c5 100644
+index ffab239192..d981aa5a5f 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
 @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -18,17 +18,18 @@ index 9e543449c..fb501a6c5 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3ca3de623..7c27696eb 100644
+index d88d120474..b95732e598 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -157,8 +157,12 @@ public class PurpurWorldConfig {
+@@ -158,9 +158,13 @@ public class PurpurWorldConfig {
-     }
  
      public boolean lavaInfinite = false;
+     public int lavaInfiniteRequiredSources = 2;
 +    public int lavaSpeedNether = 10;
 +    public int lavaSpeedNotNether = 30;
      private void lavaSettings() {
          lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite);
+         lavaInfiniteRequiredSources = getInt("blocks.lava.infinite-required-sources", lavaInfiniteRequiredSources);
 +        lavaSpeedNether = getInt("blocks.lava.speed.nether", lavaSpeedNether);
 +        lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }

patches/server/0088-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 ea7934060..6853ba319 100644
+index ea7934060d..6853ba3194 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 ea7934060..6853ba319 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 96a8abb18..194b76059 100644
+index 96a8abb183..194b76059c 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 96a8abb18..194b76059 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 a11612fa0..3e5c69287 100644
+index a11612fa05..3e5c692876 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 a11612fa0..3e5c69287 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 2d2830adc..ce6d79780 100644
+index 2d2830adc5..ce6d797801 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 2d2830adc..ce6d79780 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 b52b8d0d8..69e98dceb 100644
+index b52b8d0d84..69e98dcebe 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,10 +193,10 @@ index b52b8d0d8..69e98dceb 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 401489cab..2c0aeeb24 100644
+index f2be296132..c1ebb0de18 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -265,6 +265,15 @@ public class PurpurWorldConfig {
+@@ -267,6 +267,15 @@ public class PurpurWorldConfig {
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
      }
  
@@ -212,7 +212,7 @@ index 401489cab..2c0aeeb24 100644
      public boolean enderDragonAlwaysDropsEggBlock = false;
      public boolean enderDragonAlwaysDropsFullExp = false;
      private void enderDragonSettings() {
-@@ -299,6 +308,15 @@ public class PurpurWorldConfig {
+@@ -301,6 +310,15 @@ public class PurpurWorldConfig {
          giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
      }
  
@@ -228,7 +228,7 @@ index 401489cab..2c0aeeb24 100644
      public double illusionerMaxHealth = 32.0D;
      public double illusionerMovementSpeed = 0.5D;
      public double illusionerFollowRange = 18.0D;
-@@ -369,8 +387,35 @@ public class PurpurWorldConfig {
+@@ -371,8 +389,35 @@ public class PurpurWorldConfig {
          witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
      }
  

patches/server/0089-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 6fe5678cf..bd0267ee4 100644
+index 6fe5678cff..bd0267ee4b 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 6fe5678cf..bd0267ee4 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 875b08207..e8acb6524 100644
+index 04ad775cbd..d7ac23524a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1574,6 +1574,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -40,7 +40,7 @@ index 875b08207..e8acb6524 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
-index 362ca695d..1942fae27 100644
+index 362ca695d8..1942fae270 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 {
@@ -108,7 +108,7 @@ index 362ca695d..1942fae27 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 3a70900c7..92704a078 100644
+index 3a70900c73..92704a0789 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;
@@ -329,10 +329,10 @@ index 3a70900c7..92704a078 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 2c0aeeb24..1fe816eb0 100644
+index c1ebb0de18..66ab460583 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -331,6 +331,15 @@ public class PurpurWorldConfig {
+@@ -333,6 +333,15 @@ public class PurpurWorldConfig {
          ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
      }
  

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

@@ -5,7 +5,7 @@ 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 0e74794d3..d617b5345 100644
+index 0e74794d3a..d617b5345d 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 {
@@ -26,10 +26,10 @@ index 0e74794d3..d617b5345 100644
          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 1fe816eb0..c7ce9651b 100644
+index 66ab460583..6828041e9d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -276,9 +276,11 @@ public class PurpurWorldConfig {
+@@ -278,9 +278,11 @@ public class PurpurWorldConfig {
  
      public boolean enderDragonAlwaysDropsEggBlock = false;
      public boolean enderDragonAlwaysDropsFullExp = false;

patches/server/0091-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 75745af34..84c0ec1b5 100644
+index 75745af343..84c0ec1b50 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 75745af34..84c0ec1b5 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 e0e72779c..386eae71a 100644
+index e0e72779c0..386eae71a1 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 e0e72779c..386eae71a 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 5d5fe1412..6d9181cd6 100644
+index 5d5fe14129..6d9181cd65 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 5d5fe1412..6d9181cd6 100644
          return this.getBrightness(EnumSkyBlock.SKY, blockposition) >= this.J();
      }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 4e3f01bc7..ac1ea2f0c 100644
+index 4e3f01bc79..ac1ea2f0c1 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 4e3f01bc7..ac1ea2f0c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index beaea041d..ce8834980 100644
+index beaea041dc..ce8834980f 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -386,6 +386,7 @@ public final class SpawnerCreature {
@@ -233,7 +233,7 @@ index beaea041d..ce8834980 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 856f422e5..63f2dee38 100644
+index 856f422e58..63f2dee384 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1432,6 +1432,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -245,10 +245,10 @@ index 856f422e5..63f2dee38 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 c7ce9651b..89782b7d1 100644
+index 6828041e9d..f61c1ce30d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -336,10 +336,34 @@ public class PurpurWorldConfig {
+@@ -338,10 +338,34 @@ public class PurpurWorldConfig {
      public double phantomAttackedByCrystalRadius = 0.0D;
      public float phantomAttackedByCrystalDamage = 1.0F;
      public double phantomOrbitCrystalRadius = 0.0D;

patches/server/0093-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 21c5ad83a..521d161a3 100644
+index 21c5ad83a9..521d161a3d 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,10 +30,10 @@ index 21c5ad83a..521d161a3 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 a85803fed..4f1998d7e 100644
+index 2c5c650e11..c0314fd6e1 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 {
+@@ -242,6 +242,22 @@ public class PurpurWorldConfig {
          lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }
  

patches/server/0099-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 a04e2f9d3..a5c4b80ec 100644
+index 5a38ee5bd9..9c967409ed 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -437,6 +437,11 @@ public class PurpurWorldConfig {
+@@ -439,6 +439,11 @@ public class PurpurWorldConfig {
          snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
      }
  
@@ -21,7 +21,7 @@ index a04e2f9d3..a5c4b80ec 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 89dc611cd..11fbdfad5 100644
+index b47d6fa2de..ff0621e08a 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/0102-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 b3616185d..706760bae 100644
+index 92704a0789..03c9a8d0c2 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 b3616185d..706760bae 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 4c379916d..ea6b61c9b 100644
+index 4c379916d8..ea6b61c9b8 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 4c379916d..ea6b61c9b 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 a5c4b80ec..2f5a67097 100644
+index 9c967409ed..eb80f6f878 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -392,6 +392,9 @@ public class PurpurWorldConfig {
+@@ -394,6 +394,9 @@ public class PurpurWorldConfig {
      public int phantomSpawnOverheadRadius = 10;
      public int phantomSpawnMinPerAttempt = 1;
      public int phantomSpawnMaxPerAttempt = -1;
@@ -83,7 +83,7 @@ index a5c4b80ec..2f5a67097 100644
      private void phantomSettings() {
          phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
          phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
-@@ -408,6 +411,9 @@ public class PurpurWorldConfig {
+@@ -410,6 +413,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/0103-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 71644c3d9..0467020bb 100644
+index 71644c3d99..0467020bbb 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -640,7 +640,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -18,10 +18,10 @@ index 71644c3d9..0467020bb 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 2f5a67097..907fec463 100644
+index eb80f6f878..15328f6efe 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -455,6 +455,7 @@ public class PurpurWorldConfig {
+@@ -457,6 +457,7 @@ public class PurpurWorldConfig {
      public boolean villagerFollowEmeraldBlock = false;
      public int villagerSpawnIronGolemRadius = 0;
      public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index 2f5a67097..907fec463 100644
      private void villagerSettings() {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
-@@ -463,6 +464,7 @@ public class PurpurWorldConfig {
+@@ -465,6 +466,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/0104-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 c2e830db7..3b4cc9871 100644
+index c2e830db7a..3b4cc9871c 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,10 +26,10 @@ index c2e830db7..3b4cc9871 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 907fec463..14ac36673 100644
+index 15328f6efe..7a37c63538 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -274,6 +274,11 @@ public class PurpurWorldConfig {
+@@ -276,6 +276,11 @@ public class PurpurWorldConfig {
  
      }
  

patches/server/0115-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 b5191eb0b..cde5c46fe 100644
+index b5191eb0b1..cde5c46fee 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,10 +17,10 @@ index b5191eb0b..cde5c46fe 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fd100a9cc..9d8f8bf69 100644
+index 0a9d75e82a..a4492d4a5c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -343,6 +343,11 @@ public class PurpurWorldConfig {
+@@ -345,6 +345,11 @@ public class PurpurWorldConfig {
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
      }
  

patches/server/0116-Add-option-to-reset-reputation-when-villager-is-cure.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to reset reputation when villager is cured
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 0467020bb..7add2fca1 100644
+index 0467020bbb..7add2fca10 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -39,7 +39,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -26,10 +26,10 @@ index 0467020bb..7add2fca1 100644
              this.by.a(entity.getUniqueID(), ReputationType.MINOR_POSITIVE, 25);
          } else if (reputationevent == ReputationEvent.e) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9d8f8bf69..58135b6b2 100644
+index a4492d4a5c..4820b1a6d6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -544,9 +544,11 @@ public class PurpurWorldConfig {
+@@ -546,9 +546,11 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;

patches/server/0118-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 e8acb6524..1f8ea2eeb 100644
+index d7ac23524a..b1c7231bbe 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -3417,8 +3417,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -24,7 +24,7 @@ index e8acb6524..1f8ea2eeb 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 03d707ed0..028a7fe2c 100644
+index 03d707ed09..028a7fe2cd 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 03d707ed0..028a7fe2c 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 58135b6b2..b070eed98 100644
+index 4820b1a6d6..3fda106ee5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -483,8 +483,10 @@ public class PurpurWorldConfig {
+@@ -485,8 +485,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean squidImmuneToEAR = true;

patches/server/0119-Ridables.patch

@@ -4959,7 +4959,7 @@ index 8714d1574d..af3739c79a 100644
  
      public static int dungeonSeed = -1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b070eed986..a0684f16cb 100644
+index 3fda106ee5..0f1be67e16 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -42,11 +42,6 @@ public class PurpurWorldConfig {
@@ -4974,7 +4974,7 @@ index b070eed986..a0684f16cb 100644
      private ConfigurationSection getConfigurationSection(String path) {
          ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path);
          return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path);
-@@ -317,65 +312,188 @@ public class PurpurWorldConfig {
+@@ -319,65 +314,188 @@ public class PurpurWorldConfig {
          turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
      }
  
@@ -5163,7 +5163,7 @@ index b070eed986..a0684f16cb 100644
      public float giantStepHeight = 2.0F;
      public float giantJumpHeight = 1.0F;
      public double giantMaxHealth = 100.0D;
-@@ -384,6 +502,8 @@ public class PurpurWorldConfig {
+@@ -386,6 +504,8 @@ public class PurpurWorldConfig {
      public boolean giantHaveAI = false;
      public boolean giantHaveHostileAI = false;
      private void giantSettings() {
@@ -5172,7 +5172,7 @@ index b070eed986..a0684f16cb 100644
          giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight);
          giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
          giantMaxHealth = getDouble("mobs.giant.max-health", giantMaxHealth);
-@@ -393,29 +513,119 @@ public class PurpurWorldConfig {
+@@ -395,29 +515,119 @@ public class PurpurWorldConfig {
          giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
      }
  
@@ -5292,7 +5292,7 @@ index b070eed986..a0684f16cb 100644
      public double phantomAttackedByCrystalRadius = 0.0D;
      public float phantomAttackedByCrystalDamage = 1.0F;
      public double phantomOrbitCrystalRadius = 0.0D;
-@@ -435,6 +645,11 @@ public class PurpurWorldConfig {
+@@ -437,6 +647,11 @@ public class PurpurWorldConfig {
      public boolean phantomIgnorePlayersWithTorch = false;
      public boolean phantomBurnInDaylight = true;
      private void phantomSettings() {
@@ -5304,7 +5304,7 @@ index b070eed986..a0684f16cb 100644
          phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
          phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
          phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
-@@ -455,40 +670,184 @@ public class PurpurWorldConfig {
+@@ -457,40 +672,184 @@ public class PurpurWorldConfig {
          phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
      }
  
@@ -5489,7 +5489,7 @@ index b070eed986..a0684f16cb 100644
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerCanBeLeashed = false;
-@@ -498,6 +857,8 @@ public class PurpurWorldConfig {
+@@ -500,6 +859,8 @@ public class PurpurWorldConfig {
      public int villagerSpawnIronGolemLimit = 0;
      public boolean villagerCanBreed = true;
      private void villagerSettings() {
@@ -5498,7 +5498,7 @@ index b070eed986..a0684f16cb 100644
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
-@@ -508,46 +869,109 @@ public class PurpurWorldConfig {
+@@ -510,46 +871,109 @@ public class PurpurWorldConfig {
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
      }
  

patches/server/0124-Customizable-WitherBoss-Health-and-Healing.patch

@@ -53,10 +53,10 @@ index 1054b492c2..2a288d3726 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6ca2815b03..54319b0979 100644
+index 4d6dc69def..66c9da792c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -901,10 +901,16 @@ public class PurpurWorldConfig {
+@@ -903,10 +903,16 @@ public class PurpurWorldConfig {
      public boolean witherRidable = false;
      public boolean witherRidableInWater = false;
      public double witherMaxY = 256D;

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

@@ -69,10 +69,10 @@ index d08747c66a..7b2a66d6d3 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 b865beceb0..caef18518b 100644
+index 52e6e11a56..d6b91bc003 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -998,12 +998,14 @@ public class PurpurWorldConfig {
+@@ -1000,12 +1000,14 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;

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

@@ -38,10 +38,10 @@ index c9d2461318..aa294a46e4 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 a36989d2b3..1d48cc4187 100644
+index af7c495da1..9c17475a00 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -859,10 +859,12 @@ public class PurpurWorldConfig {
+@@ -861,10 +861,12 @@ public class PurpurWorldConfig {
      public boolean squidRidable = false;
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;