Close #12 - Make llamas WASD controllable

patches/server/0007-Ridables.patch

@@ -1,4 +1,4 @@
-From d7b3299a3aaf3ba71cbae864bab62d1edc2c450e Mon Sep 17 00:00:00 2001
+From a434d70db1a28df0eec9ca2b6694b38f440a341b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -43,8 +43,8 @@ Subject: [PATCH] Ridables
  .../minecraft/server/EntityInsentient.java    |  48 +-
  .../net/minecraft/server/EntityIronGolem.java |  23 +-
  .../net/minecraft/server/EntityLiving.java    |  21 +-
- .../net/minecraft/server/EntityLlama.java     |  54 +-
- .../minecraft/server/EntityLlamaTrader.java   |  13 +
+ .../net/minecraft/server/EntityLlama.java     |  64 +-
+ .../minecraft/server/EntityLlamaTrader.java   |  23 +
  .../net/minecraft/server/EntityMagmaCube.java |  17 +
  .../minecraft/server/EntityMushroomCow.java   |  17 +
  .../net/minecraft/server/EntityOcelot.java    |  19 +
@@ -93,7 +93,7 @@ Subject: [PATCH] Ridables
  .../minecraft/server/ProjectileHelper.java    |   1 +
  src/main/java/net/minecraft/server/Vec3D.java |   3 +
  src/main/java/net/minecraft/server/World.java |   7 +
- .../net/pl3x/purpur/PurpurWorldConfig.java    | 591 ++++++++++++++++++
+ .../net/pl3x/purpur/PurpurWorldConfig.java    | 595 ++++++++++++++++++
  .../purpur/controller/ControllerLookWASD.java |  75 +++
  .../purpur/controller/ControllerMoveWASD.java |  86 +++
  .../controller/ControllerMoveWASDFlying.java  |  53 ++
@@ -102,7 +102,7 @@ Subject: [PATCH] Ridables
  .../net/pl3x/purpur/entity/DolphinSpit.java   | 119 ++++
  .../pathfinder/PathfinderGoalHasRider.java    |  21 +
  .../craftbukkit/entity/CraftEntity.java       |  27 +
- 98 files changed, 3427 insertions(+), 204 deletions(-)
+ 98 files changed, 3451 insertions(+), 204 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -2567,10 +2567,10 @@ index 8efb646a0..77fe338a8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 193dbfc5f..5b87b245f 100644
+index 193dbfc5f..7a4e64a3d 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
-@@ -16,7 +16,36 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -16,8 +16,47 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
  
      public EntityLlama(EntityTypes<? extends EntityLlama> entitytypes, World world) {
          super(entitytypes, world);
@@ -2600,14 +2600,25 @@ index 193dbfc5f..5b87b245f 100644
 +
 +    // Purpur start
 +    @Override
++    public boolean isRidable() {
++        return world.purpurConfig.llamaRidable;
++    }
++
++    @Override
 +    public boolean isRidableInWater() {
 +        return world.purpurConfig.llamaRidableInWater;
      }
-+    // Purpur end
  
++    @Override
++    public boolean requireShiftToMount() {
++        return false; // shift reserved for opening inventory
++    }
++    // Purpur end
++
      public void setStrength(int i) {
          this.datawatcher.set(EntityLlama.bF, Math.max(1, Math.min(5, i)));
-@@ -58,6 +87,14 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+     }
+@@ -58,6 +97,14 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
      @Override
      protected void initPathfinder() {
          this.goalSelector.a(0, new PathfinderGoalFloat(this));
@@ -2615,14 +2626,14 @@ index 193dbfc5f..5b87b245f 100644
 +        this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this) {
 +            @Override
 +            public boolean a() {
-+                return entity.getRidingPassenger() instanceof EntityHuman && isSaddled();
++                return super.a() && isSaddled();
 +            }
 +        });
 +        // Purpur end
          this.goalSelector.a(1, new PathfinderGoalTame(this, 1.2D));
          this.goalSelector.a(2, new PathfinderGoalLlamaFollow(this, 2.0999999046325684D));
          this.goalSelector.a(3, new PathfinderGoalArrowAttack(this, 1.25D, 40, 20.0F));
-@@ -67,6 +104,14 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -67,6 +114,14 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          this.goalSelector.a(6, new PathfinderGoalRandomStrollLand(this, 0.7D));
          this.goalSelector.a(7, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
@@ -2637,7 +2648,7 @@ index 193dbfc5f..5b87b245f 100644
          this.targetSelector.a(1, new EntityLlama.c(this));
          this.targetSelector.a(2, new EntityLlama.a(this));
      }
-@@ -253,6 +298,13 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -253,6 +308,13 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          return false;
      }
  
@@ -2651,7 +2662,7 @@ index 193dbfc5f..5b87b245f 100644
      @Override
      public void a(IInventory iinventory) {
          EnumColor enumcolor = this.eZ();
-@@ -286,7 +338,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -286,7 +348,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
      }
  
      @Nullable
@@ -2661,24 +2672,34 @@ index 193dbfc5f..5b87b245f 100644
  
          return i == -1 ? null : EnumColor.fromColorIndex(i);
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
-index 4cebd67e8..283c1ac94 100644
+index 4cebd67e8..08c4ca3f3 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
-@@ -11,6 +11,13 @@ public class EntityLlamaTrader extends EntityLlama {
+@@ -11,6 +11,23 @@ public class EntityLlamaTrader extends EntityLlama {
          super(entitytypes, world);
      }
  
 +    // Purpur start
 +    @Override
++    public boolean isRidable() {
++        return world.purpurConfig.llamaTraderRidable;
++    }
++
++    @Override
 +    public boolean isRidableInWater() {
 +        return world.purpurConfig.llamaTraderRidableInWater;
 +    }
++
++    @Override
++    public boolean requireShiftToMount() {
++        return false; // shift reserved for opening inventory
++    }
 +    // Purpur end
 +
      @Override
      protected EntityLlama fa() {
          return (EntityLlama) EntityTypes.TRADER_LLAMA.a(this.world);
-@@ -79,6 +86,12 @@ public class EntityLlamaTrader extends EntityLlama {
+@@ -79,6 +96,12 @@ public class EntityLlamaTrader extends EntityLlama {
          return this.isLeashed() && !this.fh();
      }
  
@@ -5191,10 +5212,10 @@ index 1131d4326..7451b7fc4 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index eda37fa43..fafbea673 100644
+index eda37fa43..430e31a2a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -64,4 +64,595 @@ public class PurpurWorldConfig {
+@@ -64,4 +64,599 @@ public class PurpurWorldConfig {
          PurpurConfig.config.addDefault("world-settings.default." + path, def);
          return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
      }
@@ -5438,13 +5459,17 @@ index eda37fa43..fafbea673 100644
 +        ironGolemRequireShiftToMount = getBoolean("mobs.iron_golem.require-shift-to-mount", ironGolemRequireShiftToMount);
 +    }
 +
++    public boolean llamaRidable = false;
 +    public boolean llamaRidableInWater = false;
 +    private void llamaSettings() {
++        llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
 +        llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
 +    }
 +
++    public boolean llamaTraderRidable = false;
 +    public boolean llamaTraderRidableInWater = false;
 +    private void llamaTraderSettings() {
++        llamaTraderRidable = getBoolean("mobs.trader_llama.ridable", llamaTraderRidable);
 +        llamaTraderRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", llamaTraderRidableInWater);
 +    }
 +

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

@@ -1,4 +1,4 @@
-From e0c64e1eaaf7718ed96b38e3b83ecd196123069e Mon Sep 17 00:00:00 2001
+From cc32d1e064dadb7ca0e568c9115411faf97110dd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Zombie horse naturally spawn
@@ -38,10 +38,10 @@ index 941eee838..56d598186 100644
  
                  this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 749fa33e5..1a8b8de8d 100644
+index 9a184f7a2..afae9a626 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -649,9 +649,11 @@ public class PurpurWorldConfig {
+@@ -653,9 +653,11 @@ public class PurpurWorldConfig {
  
      public boolean zombieHorseCanSwim = false;
      public boolean zombieHorseRidableInWater = false;

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

@@ -1,4 +1,4 @@
-From 1926013fa1646f366b157e351060a28f9624385b Mon Sep 17 00:00:00 2001
+From c4acb9e5dc63b31bbea9ec78610f310546d93ef5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 31 Aug 2019 17:47:11 -0500
 Subject: [PATCH] Rabbit naturally spawn toast and killer
@@ -9,7 +9,7 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer
  2 files changed, 18 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 9040ab1c54..0232226f06 100644
+index 9040ab1c5..0232226f0 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -364,6 +364,10 @@ public class EntityRabbit extends EntityAnimal {
@@ -41,10 +41,10 @@ index 9040ab1c54..0232226f06 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 e38d0bea2c..7df44adc8a 100644
+index dada173c8..3cdbbf3d2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -432,10 +432,14 @@ public class PurpurWorldConfig {
+@@ -436,10 +436,14 @@ public class PurpurWorldConfig {
      public boolean rabbitRidable = false;
      public boolean rabbitRidableInWater = false;
      public boolean rabbitRequireShiftToMount = true;

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

@@ -1,4 +1,4 @@
-From 6a5dac19f54fbfd76de115230a7b58c94a93f732 Mon Sep 17 00:00:00 2001
+From e53772a5ca22176f9c9b1e3e61dea560f0a17441 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 01:14:46 -0500
 Subject: [PATCH] Pigs give saddle back
@@ -9,7 +9,7 @@ Subject: [PATCH] Pigs give saddle back
  2 files changed, 14 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index e6a7f8ef37..d78666dbb2 100644
+index e6a7f8ef3..d78666dbb 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -135,6 +135,18 @@ public class EntityPig extends EntityAnimal {
@@ -32,10 +32,10 @@ index e6a7f8ef37..d78666dbb2 100644
              return true;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d160efa0fe..fa7974bd15 100644
+index 7908bb160..1c0273a04 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -405,9 +405,11 @@ public class PurpurWorldConfig {
+@@ -409,9 +409,11 @@ public class PurpurWorldConfig {
  
      public boolean pigRidable = false;
      public boolean pigRidableInWater = false;

patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch

@@ -1,4 +1,4 @@
-From dfcb225c82be95d7256af4e39310f060351a972a Mon Sep 17 00:00:00 2001
+From ee82731c8f2d909d2632453c52bdef77ba506116 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 18 May 2019 16:59:52 -0500
 Subject: [PATCH] Phantoms do not spawn on creative players
@@ -9,7 +9,7 @@ Subject: [PATCH] Phantoms do not spawn on creative players
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index f488c22ed6..748983da29 100644
+index f488c22ed..748983da2 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -31,7 +31,7 @@ public class MobSpawnerPhantom {
@@ -22,10 +22,10 @@ index f488c22ed6..748983da29 100644
  
                              if (!worldserver.worldProvider.f() || blockposition.getY() >= worldserver.getSeaLevel() && worldserver.f(blockposition)) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fa7974bd15..9cd1a32ed8 100644
+index 1c0273a04..386697f48 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -396,11 +396,13 @@ public class PurpurWorldConfig {
+@@ -400,11 +400,13 @@ public class PurpurWorldConfig {
      public boolean phantomRidableInWater = false;
      public boolean phantomRequireShiftToMount = true;
      public double phantomMaxY = 256D;

patches/server/0023-Phantoms-only-attack-insomniacs.patch

@@ -1,4 +1,4 @@
-From 42e04689cfbb69dca93eb847bdd2f84d667f3623 Mon Sep 17 00:00:00 2001
+From 25b87a628551b790207e685e9e1e332fbb1c8b37 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 20:33:41 -0600
 Subject: [PATCH] Phantoms only attack insomniacs
@@ -10,7 +10,7 @@ Subject: [PATCH] Phantoms only attack insomniacs
  3 files changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 5ccbc341d2..cb5eed8785 100644
+index 5ccbc341d..cb5eed878 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -276,6 +276,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -22,7 +22,7 @@ index 5ccbc341d2..cb5eed8785 100644
                              return true;
                          }
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index a2d1ef3602..e1fdee2794 100644
+index a2d1ef360..e1fdee279 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -23,6 +23,7 @@ public final class IEntitySelector {
@@ -34,10 +34,10 @@ index a2d1ef3602..e1fdee2794 100644
      public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
          double d4 = d3 * d3;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9cd1a32ed8..9ae372d7d0 100644
+index 386697f48..a275bb6dc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -397,12 +397,14 @@ public class PurpurWorldConfig {
+@@ -401,12 +401,14 @@ public class PurpurWorldConfig {
      public boolean phantomRequireShiftToMount = true;
      public double phantomMaxY = 256D;
      public boolean phantomIgnoreCreative = false;

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

@@ -1,4 +1,4 @@
-From 43f02f8755a7d3a4203d31857f8ce9b2fea83c8b Mon Sep 17 00:00:00 2001
+From 33327b79faa2b4b08489ab7a442b535d170f6c75 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -364,10 +364,10 @@ index 4157e50e4..774ec96f0 100644
          return this.a(oclass, axisalignedbb, IEntitySelector.f);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9ae372d7d..9aafb4616 100644
+index a275bb6dc..78c49835d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -398,6 +398,9 @@ public class PurpurWorldConfig {
+@@ -402,6 +402,9 @@ public class PurpurWorldConfig {
      public double phantomMaxY = 256D;
      public boolean phantomIgnoreCreative = false;
      public boolean phantomOnlyAttackInsomniacs = false;
@@ -377,7 +377,7 @@ index 9ae372d7d..9aafb4616 100644
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -405,6 +408,9 @@ public class PurpurWorldConfig {
+@@ -409,6 +412,9 @@ public class PurpurWorldConfig {
          phantomMaxY = getDouble("mobs.phantom.ridable-max-y", phantomMaxY);
          phantomIgnoreCreative = getBoolean("mobs.phantom.do-not-spawn-on-creative-players", phantomIgnoreCreative);
          phantomOnlyAttackInsomniacs = getBoolean("mobs.phantom.only-attack-insomniacs", phantomOnlyAttackInsomniacs);

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

@@ -1,4 +1,4 @@
-From d48cf26f0e92496d4c60a9e846cd05b37af7aed8 Mon Sep 17 00:00:00 2001
+From 2b243a31565af55f995ce85563c6be01a3b54b72 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:58:44 -0500
 Subject: [PATCH] Snowman drop and put back pumpkin
@@ -9,7 +9,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
  2 files changed, 21 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 941873513f..efc2205f7c 100644
+index 941873513..efc2205f7 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -8,6 +8,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
@@ -47,10 +47,10 @@ index 941873513f..efc2205f7c 100644
              return tryRide(entityhuman, enumhand); // Purpur
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9aafb4616d..5744a65cce 100644
+index 78c49835d..db4396418 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -536,11 +536,15 @@ public class PurpurWorldConfig {
+@@ -540,11 +540,15 @@ public class PurpurWorldConfig {
      public boolean snowGolemRidableInWater = false;
      public boolean snowGolemRequireShiftToMount = true;
      public boolean snowGolemLeaveTrailWhenRidden = false;

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

@@ -1,4 +1,4 @@
-From 6e77b067283502e9f4d5064c2086974c5d7894a3 Mon Sep 17 00:00:00 2001
+From 8255937a5c894806e5cfc0e433dc29e605b9e9a5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 15 Jun 2019 03:12:15 -0500
 Subject: [PATCH] Make Iron Golems Swim
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
  2 files changed, 3 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 288a043fbd..0cc3b8eb01 100644
+index 288a043fb..0cc3b8eb0 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -36,6 +36,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,7 +21,7 @@ index 288a043fbd..0cc3b8eb01 100644
          this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index dcf0f58a29..114fe87f4a 100644
+index a1d075246..6e506dff8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -342,10 +342,12 @@ public class PurpurWorldConfig {
@@ -36,7 +36,7 @@ index dcf0f58a29..114fe87f4a 100644
 +        ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
      }
  
-     public boolean llamaRidableInWater = false;
+     public boolean llamaRidable = false;
 -- 
 2.24.0
 

patches/server/0041-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From d371951ac40b0e5669ef9ac24e56aa6fb4aeae4c Mon Sep 17 00:00:00 2001
+From 87d0090bcb1df24dfbbd64bd1b6c9e62c4cf2702 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix pig zombies (MC-56653)
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index fb9ef88ea3..227fff3f1d 100644
+index fb9ef88ea..227fff3f1 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -155,6 +155,7 @@ public class EntityPigZombie extends EntityZombie {
@@ -43,10 +43,10 @@ index fb9ef88ea3..227fff3f1d 100644
  
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9324fdd095..84a89d7875 100644
+index d11dc5f9f..76a8ac3b8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -777,10 +777,12 @@ public class PurpurWorldConfig {
+@@ -781,10 +781,12 @@ public class PurpurWorldConfig {
      public boolean zombiePigmanRidable = false;
      public boolean zombiePigmanRidableInWater = false;
      public boolean zombiePigmanRequireShiftToMount = true;

patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch

@@ -1,4 +1,4 @@
-From 7fbf6505b203b68f49f57a612ccc6fb21cb542c8 Mon Sep 17 00:00:00 2001
+From c6c92b0f441e139792c7e6e5a107fcf726792fc7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement a hard limit for pillager outpost spawns
  2 files changed, 3 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
-index 70f43c5159..baca8f7054 100644
+index 70f43c515..baca8f705 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 @@ -143,6 +143,7 @@ public class ChunkProviderGenerate extends ChunkGeneratorAbstract<GeneratorSetti
@@ -21,10 +21,10 @@ index 70f43c5159..baca8f7054 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bd0c2f98fa..18a30fde39 100644
+index 3864fa114..bc21ff1bf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -530,10 +530,12 @@ public class PurpurWorldConfig {
+@@ -534,10 +534,12 @@ public class PurpurWorldConfig {
      public boolean pillagerRidable = false;
      public boolean pillagerRidableInWater = false;
      public boolean pillagerRequireShiftToMount = true;

patches/server/0054-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From 414761e8796f4a32c14ddadbd317b399572c2986 Mon Sep 17 00:00:00 2001
+From 399075f2686fdf4167ef2961173a0f859645c789 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks
  2 files changed, 10 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 3eaac031fb..65cd5f53c1 100644
+index 3eaac031f..65cd5f53c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -40,10 +40,10 @@ index 3eaac031fb..65cd5f53c1 100644
          this.world.getMethodProfiler().exit();
          if (!this.et() && this.bB > 0) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b0747e092c..4156e521bd 100644
+index cbb5f16b0..b09c550e0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -738,10 +738,14 @@ public class PurpurWorldConfig {
+@@ -742,10 +742,14 @@ public class PurpurWorldConfig {
      public boolean villagerRidable = false;
      public boolean villagerRidableInWater = false;
      public boolean villagerRequireShiftToMount = true;

patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From 5db9ce638c92c2c7c79202d54aa415a841a3cb07 Mon Sep 17 00:00:00 2001
+From 1f19aa7613e60b048890bb9bea06ec73d5885925 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombies targetting turtle eggs
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 8d1f04415e..95ae6f3494 100644
+index 8d1f04415..95ae6f349 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -64,7 +64,7 @@ public class EntityZombie extends EntityMonster {
@@ -22,10 +22,10 @@ index 8d1f04415e..95ae6f3494 100644
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4156e521bd..aee946c27e 100644
+index b09c550e0..ccec59410 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -807,10 +807,12 @@ public class PurpurWorldConfig {
+@@ -811,10 +811,12 @@ public class PurpurWorldConfig {
      public boolean zombieRidable = false;
      public boolean zombieRidableInWater = false;
      public boolean zombieRequireShiftToMount = true;

patches/server/0078-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From 34ef62606af08a0c7a9466be7f7f403c94415a08 Mon Sep 17 00:00:00 2001
+From b709ecc23aa978b8a6e0a889f0c03ccab99da8f4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:12 -0500
 Subject: [PATCH] Add more llama API
@@ -10,7 +10,7 @@ Subject: [PATCH] Add more llama API
  3 files changed, 61 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 5b87b245f7..00334993fe 100644
+index 7a4e64a3d..576179756 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -23,7 +23,7 @@ index 5b87b245f7..00334993fe 100644
  
      public EntityLlama(EntityTypes<? extends EntityLlama> entitytypes, World world) {
          super(entitytypes, world);
-@@ -69,7 +70,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -79,7 +80,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          if (!this.inventoryChest.getItem(1).isEmpty()) {
              nbttagcompound.set("DecorItem", this.inventoryChest.getItem(1).save(new NBTTagCompound()));
          }
@@ -32,7 +32,7 @@ index 5b87b245f7..00334993fe 100644
      }
  
      @Override
-@@ -80,7 +81,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -90,7 +91,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          if (nbttagcompound.hasKeyOfType("DecorItem", 10)) {
              this.inventoryChest.setItem(1, ItemStack.a(nbttagcompound.getCompound("DecorItem")));
          }
@@ -45,7 +45,7 @@ index 5b87b245f7..00334993fe 100644
          this.eI();
      }
  
-@@ -417,19 +422,24 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -427,19 +432,24 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          }
      }
  
@@ -70,7 +70,7 @@ index 5b87b245f7..00334993fe 100644
      public boolean fc() {
          return this.bK != null;
      }
-@@ -440,7 +450,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -450,7 +460,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
      }
  
      @Nullable
@@ -80,7 +80,7 @@ index 5b87b245f7..00334993fe 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
-index e181d83505..8376f1dc4e 100644
+index e181d8350..8376f1dc4 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 @@ -6,7 +6,7 @@ import java.util.List;
@@ -109,7 +109,7 @@ index e181d83505..8376f1dc4e 100644
              double d0 = this.a.h((Entity) this.a.fe());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 3f94c5a920..a027634801 100644
+index 3f94c5a92..a02763480 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE

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

@@ -1,4 +1,4 @@
-From 1c6fb147f41897306cc5c0506486ee6fd343cd7a Mon Sep 17 00:00:00 2001
+From a5f8e742921a2f5bed7ba4b4623eca641f47693d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks
@@ -11,7 +11,7 @@ Subject: [PATCH] Villagers follow emerald blocks
  4 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 65cd5f53c1..b31f614e6b 100644
+index 65cd5f53c..b31f614e6 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -89,6 +89,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -23,7 +23,7 @@ index 65cd5f53c1..b31f614e6b 100644
      // Purpur end
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index ddd19aa2f9..44947be833 100644
+index ddd19aa2f..44947be83 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 @@ -13,7 +13,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -36,7 +36,7 @@ index ddd19aa2f9..44947be833 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 4e9c5e84a9..14ca5fc367 100644
+index 4e9c5e84a..14ca5fc36 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -57,6 +57,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -48,10 +48,10 @@ index 4e9c5e84a9..14ca5fc367 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 505a52c42f..425e12116a 100644
+index 74496bf22..de0142f7f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -776,21 +776,25 @@ public class PurpurWorldConfig {
+@@ -780,21 +780,25 @@ public class PurpurWorldConfig {
      public boolean villagerRequireShiftToMount = true;
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;

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

@@ -1,4 +1,4 @@
-From e02c6ef31c1c4a151a1ede4d00be701d026b3839 Mon Sep 17 00:00:00 2001
+From e51f995e94eef23aa8499913b05dc78f816320d0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
@@ -11,7 +11,7 @@ Subject: [PATCH] Allow leashing villagers
  4 files changed, 19 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 66b4831949..bac6cea1ff 100644
+index 66b483194..bac6cea1f 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1062,6 +1062,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -23,7 +23,7 @@ index 66b4831949..bac6cea1ff 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 b31f614e6b..315440b3fb 100644
+index b31f614e6..315440b3f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -1006,4 +1006,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,7 +39,7 @@ index b31f614e6b..315440b3fb 100644
 +    // Purpur - end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 14ca5fc367..427c589075 100644
+index 14ca5fc36..427c58907 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -283,4 +283,11 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -55,10 +55,10 @@ index 14ca5fc367..427c589075 100644
 +    // Purpur - end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8eff6a6dd6..097ff8ae35 100644
+index 5bf4535b6..ed41e3326 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -781,6 +781,7 @@ public class PurpurWorldConfig {
+@@ -785,6 +785,7 @@ public class PurpurWorldConfig {
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
@@ -66,7 +66,7 @@ index 8eff6a6dd6..097ff8ae35 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -788,17 +789,20 @@ public class PurpurWorldConfig {
+@@ -792,17 +793,20 @@ public class PurpurWorldConfig {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);

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

@@ -1,4 +1,4 @@
-From 31d1d5d24e7c68a97b26a03464325b36f19bb38e Mon Sep 17 00:00:00 2001
+From bf578a6dc05c52376cf97a45d76790d6cb5a0472 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
  2 files changed, 5 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 315440b3fb..fe0e646ea6 100644
+index 315440b3f..fe0e646ea 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -903,6 +903,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -22,10 +22,10 @@ index 315440b3fb..fe0e646ea6 100644
          int i = 0;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 097ff8ae35..c57982274c 100644
+index ed41e3326..636e10730 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -782,6 +782,8 @@ public class PurpurWorldConfig {
+@@ -786,6 +786,8 @@ public class PurpurWorldConfig {
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
@@ -34,7 +34,7 @@ index 097ff8ae35..c57982274c 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -790,6 +792,8 @@ public class PurpurWorldConfig {
+@@ -794,6 +796,8 @@ public class PurpurWorldConfig {
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

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

@@ -1,4 +1,4 @@
-From 9cd75b1b6ac71627bf8901dea32954e0715c9ce5 Mon Sep 17 00:00:00 2001
+From 55d771cb7ec7edac6ce7fc484d7624aacdb9cc2d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option
@@ -9,7 +9,7 @@ Subject: [PATCH] Add wither skeleton takes wither damage option
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 8aa0a6699f..0fd740e717 100644
+index 8aa0a6699..0fd740e71 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -108,6 +108,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -21,10 +21,10 @@ index 8aa0a6699f..0fd740e717 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 29c2d64fb5..dff7cf1693 100644
+index f34b41aad..2acf779b0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -845,10 +845,12 @@ public class PurpurWorldConfig {
+@@ -849,10 +849,12 @@ public class PurpurWorldConfig {
      public boolean witherSkeletonRidable = false;
      public boolean witherSkeletonRidableInWater = false;
      public boolean witherSkeletonRequireShiftToMount = true;

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

@@ -1,4 +1,4 @@
-From cc6f8a5ce9310ecf72f78f55efa080edb5ef7b37 Mon Sep 17 00:00:00 2001
+From 6a77e54da05008a1a3eaf7665656f5c408d50510 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:46:44 -0500
 Subject: [PATCH] Breedable Polar Bears
@@ -9,7 +9,7 @@ Subject: [PATCH] Breedable Polar Bears
  2 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 0a3906bde0..42fef3abaa 100644
+index 0a3906bde..42fef3aba 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -32,6 +32,28 @@ public class EntityPolarBear extends EntityAnimal {
@@ -64,10 +64,10 @@ index 0a3906bde0..42fef3abaa 100644
          this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, 1.0D));
          this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 974e2b4b83..4cd6b75f8e 100644
+index ccdfedb31..6ca47dfaa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -667,10 +667,15 @@ public class PurpurWorldConfig {
+@@ -671,10 +671,15 @@ public class PurpurWorldConfig {
      public boolean polarBearRidable = false;
      public boolean polarBearRidableInWater = false;
      public boolean polarBearRequireShiftToMount = true;

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

@@ -1,4 +1,4 @@
-From 1f19dd3f4f74fbc713689ef84aa1a55696f90c4a Mon Sep 17 00:00:00 2001
+From a15dc515cc9b8cfda7d7d6f5e03308dd35452887 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 21:39:32 -0500
 Subject: [PATCH] Configurable jockey options
@@ -13,7 +13,7 @@ Subject: [PATCH] Configurable jockey options
  6 files changed, 112 insertions(+), 7 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 63f5969b10..f32950cc9b 100644
+index 63f5969b1..f32950cc9 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -34,6 +34,21 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -39,7 +39,7 @@ index 63f5969b10..f32950cc9b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 227fff3f1d..c78876fc42 100644
+index 227fff3f1..c78876fc4 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -32,6 +32,21 @@ public class EntityPigZombie extends EntityZombie {
@@ -65,7 +65,7 @@ index 227fff3f1d..c78876fc42 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 95ae6f3494..e60e4adc1d 100644
+index 95ae6f349..e60e4adc1 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;
@@ -139,7 +139,7 @@ index 95ae6f3494..e60e4adc1d 100644
          private GroupDataZombie(boolean flag) {
              this.a = flag;
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index db252ba4e0..e8b099d6c8 100644
+index db252ba4e..e8b099d6c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -23,6 +23,21 @@ public class EntityZombieHusk extends EntityZombie {
@@ -165,7 +165,7 @@ index db252ba4e0..e8b099d6c8 100644
  
      public static boolean b(EntityTypes<EntityZombieHusk> entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index ebbfcb75a4..8532385d8d 100644
+index ebbfcb75a..8532385d8 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -40,6 +40,21 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -191,7 +191,7 @@ index ebbfcb75a4..8532385d8d 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4cd6b75f8e..9423e5cdcb 100644
+index 6ca47dfaa..15ec90967 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -410,10 +410,16 @@ public class PurpurWorldConfig {
@@ -228,7 +228,7 @@ index 4cd6b75f8e..9423e5cdcb 100644
      }
  
      public boolean horseRidableInWater = false;
-@@ -928,11 +940,17 @@ public class PurpurWorldConfig {
+@@ -932,11 +944,17 @@ public class PurpurWorldConfig {
      public boolean zombieRidableInWater = false;
      public boolean zombieRequireShiftToMount = true;
      public boolean zombieTargetTurtleEggs = true;
@@ -246,7 +246,7 @@ index 4cd6b75f8e..9423e5cdcb 100644
      }
  
      public boolean zombieHorseCanSwim = false;
-@@ -948,19 +966,31 @@ public class PurpurWorldConfig {
+@@ -952,19 +970,31 @@ public class PurpurWorldConfig {
      public boolean zombiePigmanRidableInWater = false;
      public boolean zombiePigmanRequireShiftToMount = true;
      public boolean zombiePigmanDontTargetUnlessHit = false;