diff --git a/patches/server/0011-Integrate-ridables.patch b/patches/server/0011-Integrate-ridables.patch
index a58c49b95..aed2ff780 100644
--- a/patches/server/0011-Integrate-ridables.patch
+++ b/patches/server/0011-Integrate-ridables.patch
@@ -1,4 +1,4 @@
-From a062b19272098407c2b2de1e8796794a31c0627f Mon Sep 17 00:00:00 2001
+From b784d4883c562d97ae7a0176868e57f37c1c8a6e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
@@ -30,13 +30,13 @@ Subject: [PATCH] Integrate ridables
  .../minecraft/server/EntityHorseAbstract.java |   4 +
  .../net/minecraft/server/EntityHuman.java     |  14 +-
  .../server/EntityIllagerIllusioner.java       |   1 +
- .../minecraft/server/EntityInsentient.java    |  51 +++++++-
+ .../minecraft/server/EntityInsentient.java    |  52 +++++++-
  .../net/minecraft/server/EntityIronGolem.java |   1 +
  .../net/minecraft/server/EntityLiving.java    |  25 +++-
  .../net/minecraft/server/EntityMagmaCube.java |   3 +-
  .../minecraft/server/EntityMushroomCow.java   |   1 +
  .../net/minecraft/server/EntityOcelot.java    |   1 +
- .../net/minecraft/server/EntityPanda.java     |   1 +
+ .../net/minecraft/server/EntityPanda.java     |  22 +++-
  .../net/minecraft/server/EntityParrot.java    |   3 +-
  .../net/minecraft/server/EntityPhantom.java   |  32 ++++-
  .../java/net/minecraft/server/EntityPig.java  |  34 +++--
@@ -134,7 +134,7 @@ Subject: [PATCH] Integrate ridables
  .../controller/ControllerMoveWASDWater.java   |  42 ++++++
  .../craftbukkit/entity/CraftLivingEntity.java |  10 ++
  .../bukkit/craftbukkit/entity/CraftMob.java   |  12 ++
- 130 files changed, 1076 insertions(+), 95 deletions(-)
+ 130 files changed, 1095 insertions(+), 98 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
@@ -142,7 +142,7 @@ Subject: [PATCH] Integrate ridables
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 
 diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
-index 454627f65..df3d6cf28 100644
+index 454627f65e..df3d6cf281 100644
 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 @@ -1,6 +1,6 @@
@@ -163,7 +163,7 @@ index 454627f65..df3d6cf28 100644
              this.d = false;
              this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 352b6dfb3..a0e66b7d0 100644
+index 352b6dfb3e..a0e66b7d09 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -235,7 +235,7 @@ index 352b6dfb3..a0e66b7d0 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index e87754ef3..553245ebe 100644
+index e87754ef33..553245ebe9 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -70,7 +70,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -248,7 +248,7 @@ index e87754ef3..553245ebe 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 4c283c33b..3175f6062 100644
+index 4c283c33b5..3175f6062b 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -300,7 +300,7 @@ index 4c283c33b..3175f6062 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
-index 15db67de0..325c642f1 100644
+index 15db67de07..325c642f13 100644
 --- a/src/main/java/net/minecraft/server/EntityBlaze.java
 +++ b/src/main/java/net/minecraft/server/EntityBlaze.java
 @@ -10,6 +10,10 @@ public class EntityBlaze extends EntityMonster {
@@ -347,7 +347,7 @@ index 15db67de0..325c642f1 100644
  
              return entityliving != null && entityliving.isAlive();
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index 719983077..ed18dedd6 100644
+index 7199830772..ed18dedd6d 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -16,7 +16,7 @@ public class EntityCat extends EntityTameableAnimal {
@@ -469,7 +469,7 @@ index 719983077..ed18dedd6 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
-index 89c9306df..e9ec28362 100644
+index 89c9306df5..e9ec283625 100644
 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java
 +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java
 @@ -6,6 +6,7 @@ public class EntityCaveSpider extends EntitySpider {
@@ -481,7 +481,7 @@ index 89c9306df..e9ec28362 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index a374c3051..2ea87eee5 100644
+index a374c30519..2ea87eee5b 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -13,6 +13,7 @@ public class EntityChicken extends EntityAnimal {
@@ -502,7 +502,7 @@ index a374c3051..2ea87eee5 100644
              this.forceDrops = true; // CraftBukkit
              this.a((IMaterial) Items.EGG);
 diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java
-index 1e3782122..c0b066d18 100644
+index 1e3782122a..c0b066d188 100644
 --- a/src/main/java/net/minecraft/server/EntityCod.java
 +++ b/src/main/java/net/minecraft/server/EntityCod.java
 @@ -4,6 +4,7 @@ public class EntityCod extends EntityFishSchool {
@@ -514,7 +514,7 @@ index 1e3782122..c0b066d18 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index f053ff0e5..16a35418f 100644
+index f053ff0e50..16a35418f2 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -14,6 +14,7 @@ public class EntityCow extends EntityAnimal {
@@ -526,7 +526,7 @@ index f053ff0e5..16a35418f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 0c2c3c730..c66aed65e 100644
+index 165b07e142..2fb3c4be34 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -20,6 +20,7 @@ public class EntityCreeper extends EntityMonster {
@@ -598,7 +598,7 @@ index 0c2c3c730..c66aed65e 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
-index 04060bb3e..d13d3309c 100644
+index 04060bb3ef..d13d3309c6 100644
 --- a/src/main/java/net/minecraft/server/EntityDolphin.java
 +++ b/src/main/java/net/minecraft/server/EntityDolphin.java
 @@ -17,6 +17,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -642,7 +642,7 @@ index 04060bb3e..d13d3309c 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 7f34cdbc3..542d828a9 100644
+index 7f34cdbc34..542d828a9a 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -12,6 +12,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -681,7 +681,7 @@ index 7f34cdbc3..542d828a9 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 29fa1d1df..484a4bc45 100644
+index 29fa1d1df1..484a4bc455 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -693,7 +693,7 @@ index 29fa1d1df..484a4bc45 100644
          this.setHealth(this.getMaxHealth());
          this.noclip = true;
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index d4c4dc2fd..8c35b93d6 100644
+index d4c4dc2fdc..8c35b93d68 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -22,6 +22,7 @@ public class EntityEnderman extends EntityMonster {
@@ -705,7 +705,7 @@ index d4c4dc2fd..8c35b93d6 100644
          this.a(PathType.WATER, -1.0F);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index 10b0f9653..b191539d7 100644
+index 10b0f96531..b191539d7a 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -8,6 +8,7 @@ public class EntityEndermite extends EntityMonster {
@@ -726,7 +726,7 @@ index 10b0f9653..b191539d7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 026847dff..bd143396a 100644
+index 026847dff2..bd143396ac 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -9,6 +9,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -747,7 +747,7 @@ index 026847dff..bd143396a 100644
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index a28fbdf1e..36229a2c4 100644
+index a28fbdf1e0..36229a2c4b 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -75,11 +75,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -800,7 +800,7 @@ index a28fbdf1e..36229a2c4 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index b363e9ce9..b44e71402 100644
+index b363e9ce99..b44e714022 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal {
@@ -971,7 +971,7 @@ index b363e9ce9..b44e71402 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
-index 55b96c4d2..a05c3916f 100644
+index 55b96c4d2e..a05c3916f6 100644
 --- a/src/main/java/net/minecraft/server/EntityGhast.java
 +++ b/src/main/java/net/minecraft/server/EntityGhast.java
 @@ -10,6 +10,7 @@ public class EntityGhast extends EntityFlying implements IMonster {
@@ -983,7 +983,7 @@ index 55b96c4d2..a05c3916f 100644
          this.moveController = new EntityGhast.ControllerGhast(this);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index bcbade19e..b7e2022b1 100644
+index bcbade19ea..b7e2022b19 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -5,7 +5,9 @@ public class EntityGiantZombie extends EntityMonster {
@@ -997,7 +997,7 @@ index bcbade19e..b7e2022b1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
-index 335416d96..7835154ed 100644
+index 335416d962..7835154edd 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardian.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardian.java
 @@ -22,8 +22,15 @@ public class EntityGuardian extends EntityMonster {
@@ -1063,7 +1063,7 @@ index 335416d96..7835154ed 100644
                  Vec3D vec3d = new Vec3D(this.b - this.i.locX, this.c - this.i.locY, this.d - this.i.locZ);
                  double d0 = vec3d.f();
 diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java
-index a85a7bf59..a32f6ee2a 100644
+index a85a7bf59e..a32f6ee2a3 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java
 @@ -9,6 +9,7 @@ public class EntityGuardianElder extends EntityGuardian {
@@ -1075,7 +1075,7 @@ index a85a7bf59..a32f6ee2a 100644
          if (this.goalRandomStroll != null) {
              this.goalRandomStroll.setTimeBetweenMovement(400);
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 686bca4f2..f82837bf0 100644
+index 686bca4f2c..f82837bf0b 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -38,6 +38,10 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -1090,7 +1090,7 @@ index 686bca4f2..f82837bf0 100644
          this.loadChest();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f709e7d87..b487f37ad 100644
+index f709e7d87a..b487f37ad4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -347,9 +347,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1117,7 +1117,7 @@ index f709e7d87..b487f37ad 100644
              this.setSneaking(false);
          } else {
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 76641682b..bab9431b3 100644
+index 76641682b1..bab9431b35 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -9,6 +9,7 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -1129,7 +1129,7 @@ index 76641682b..bab9431b3 100644
          this.bA = new Vec3D[2][4];
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 48ce15484..e1560c535 100644
+index 48ce154848..68ba9b8808 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -9,6 +9,7 @@ import java.util.UUID;
@@ -1162,7 +1162,15 @@ index 48ce15484..e1560c535 100644
          this.bt = new ControllerJump(this);
          this.c = this.o();
          this.navigation = this.b(world);
-@@ -492,6 +497,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -480,6 +485,7 @@ public abstract class EntityInsentient extends EntityLiving {
+         return super.cF();
+     }
+ 
++    public void setForwardSpeed(float speed) { this.r(speed); } // Purpur - OBFHELPER
+     public void r(float f) {
+         this.bd = f;
+     }
+@@ -492,6 +498,7 @@ public abstract class EntityInsentient extends EntityLiving {
          this.bb = f;
      }
  
@@ -1170,7 +1178,7 @@ index 48ce15484..e1560c535 100644
      @Override
      public void o(float f) {
          super.o(f);
-@@ -1057,7 +1063,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1057,7 +1064,7 @@ public abstract class EntityInsentient extends EntityLiving {
      }
  
      protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
@@ -1179,7 +1187,7 @@ index 48ce15484..e1560c535 100644
      }
  
      public boolean dH() {
-@@ -1355,4 +1361,43 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1355,4 +1362,43 @@ public abstract class EntityInsentient extends EntityLiving {
      public boolean a(Item item) {
          return this.getItemInMainHand().getItem() == item || this.getItemInOffHand().getItem() == item;
      }
@@ -1224,7 +1232,7 @@ index 48ce15484..e1560c535 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index bb06d12f6..41ad48c96 100644
+index bb06d12f6c..41ad48c963 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -8,6 +8,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -1236,7 +1244,7 @@ index bb06d12f6..41ad48c96 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 66813756d..08642e924 100644
+index 66813756d5..08642e9241 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity {
@@ -1313,7 +1321,7 @@ index 66813756d..08642e924 100644
      public void l(float f) {
          this.aK = f;
 diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java
-index 595884e37..113734bae 100644
+index 595884e373..113734bae3 100644
 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java
 +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java
 @@ -4,6 +4,7 @@ public class EntityMagmaCube extends EntitySlime {
@@ -1334,7 +1342,7 @@ index 595884e37..113734bae 100644
  
          this.setMot(vec3d.x, (double) (0.42F + (float) this.getSize() * 0.1F), vec3d.z);
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 31b306211..c918288e0 100644
+index 31b3062112..c918288e08 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -17,6 +17,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -1346,7 +1354,7 @@ index 31b306211..c918288e0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 1713bead2..984121969 100644
+index 1713bead27..9841219695 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -13,6 +13,7 @@ public class EntityOcelot extends EntityAnimal {
@@ -1358,7 +1366,7 @@ index 1713bead2..984121969 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index b46ca388e..2c25439ab 100644
+index b46ca388eb..d378f87b41 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -37,6 +37,7 @@ public class EntityPanda extends EntityAnimal {
@@ -1369,8 +1377,74 @@ index b46ca388e..2c25439ab 100644
          this.moveController = new EntityPanda.i(this);
          if (!this.isBaby()) {
              this.setCanPickupLoot(true);
+@@ -67,6 +68,7 @@ public class EntityPanda extends EntityAnimal {
+         return this.u(8);
+     }
+ 
++    public void setScared(boolean scared) { this.r(scared); } // Purpur - OBFHELPER
+     public void r(boolean flag) {
+         this.d(8, flag);
+     }
+@@ -75,6 +77,7 @@ public class EntityPanda extends EntityAnimal {
+         return this.u(16);
+     }
+ 
++    public void setLayingOnBack(boolean layingOnBack) { this.s(layingOnBack); } // Purpur - OBFHELPER
+     public void s(boolean flag) {
+         this.d(16, flag);
+     }
+@@ -83,6 +86,7 @@ public class EntityPanda extends EntityAnimal {
+         return (Integer) this.datawatcher.get(EntityPanda.bD) > 0;
+     }
+ 
++    public void setEating(boolean eating) { this.t(eating); } // Purpur - OBFHELPER
+     public void t(boolean flag) {
+         this.datawatcher.set(EntityPanda.bD, flag ? 1 : 0);
+     }
+@@ -541,7 +545,7 @@ public class EntityPanda extends EntityAnimal {
+         if (itemstack.getItem() instanceof ItemMonsterEgg) {
+             return super.a(entityhuman, enumhand);
+         } else if (this.eo()) {
+-            return false;
++            return tryRide(entityhuman, enumhand); // Purpur
+         } else if (this.dY()) {
+             this.s(false);
+             return true;
+@@ -558,7 +562,7 @@ public class EntityPanda extends EntityAnimal {
+                 this.f(entityhuman);
+             } else {
+                 if (this.world.isClientSide || this.dX() || this.isInWater()) {
+-                    return false;
++                    return tryRide(entityhuman, enumhand); // Purpur
+                 }
+ 
+                 this.eB();
+@@ -575,10 +579,22 @@ public class EntityPanda extends EntityAnimal {
+ 
+             return true;
+         } else {
+-            return false;
++            return tryRide(entityhuman, enumhand); // Purpur
+         }
+     }
+ 
++    // Purpur start
++    @Override
++    public void onMount(EntityHuman entityhuman) {
++        this.setGoalTarget(null);
++        this.setForwardSpeed(0.0F);
++        this.getNavigation().stopPathfinding();
++        this.setScared(false);
++        this.setEating(false);
++        this.setLayingOnBack(false);
++    }
++    // Purpur end
++
+     @Nullable
+     @Override
+     protected SoundEffect getSoundAmbient() {
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 6173a86e0..a795047b6 100644
+index 6173a86e09..a795047b67 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -21,7 +21,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -1391,7 +1465,7 @@ index 6173a86e0..a795047b6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 6aa116f4b..238c68edf 100644
+index 6aa116f4b8..238c68edf5 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -16,12 +16,14 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -1475,7 +1549,7 @@ index 6aa116f4b..238c68edf 100644
                  EntityPhantom.this.yaw += 180.0F;
                  this.j = 0.1F;
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 616075569..fd57e5bde 100644
+index 616075569f..fd57e5bde0 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -18,6 +18,7 @@ public class EntityPig extends EntityAnimal {
@@ -1529,7 +1603,7 @@ index 616075569..fd57e5bde 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index dc08a7c57..07504f736 100644
+index dc08a7c576..07504f7363 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -13,6 +13,7 @@ public class EntityPigZombie extends EntityZombie {
@@ -1541,7 +1615,7 @@ index dc08a7c57..07504f736 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
-index 845f7ac32..c945f52f2 100644
+index 845f7ac32a..c945f52f22 100644
 --- a/src/main/java/net/minecraft/server/EntityPillager.java
 +++ b/src/main/java/net/minecraft/server/EntityPillager.java
 @@ -11,6 +11,7 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow,
@@ -1553,7 +1627,7 @@ index 845f7ac32..c945f52f2 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 182a3195e..8ecd2a6f2 100644
+index 182a3195ef..8ecd2a6f2f 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -1,5 +1,8 @@
@@ -1625,7 +1699,7 @@ index 182a3195e..8ecd2a6f2 100644
  
          public e() {
 diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
-index 153d34120..7a008627b 100644
+index 153d34120a..7a008627b4 100644
 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java
 +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java
 @@ -15,6 +15,7 @@ public class EntityPufferFish extends EntityFish {
@@ -1637,7 +1711,7 @@ index 153d34120..7a008627b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index f6fa87158..ffdb39725 100644
+index f6fa871587..ffdb39725a 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -14,6 +14,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -1658,7 +1732,7 @@ index f6fa87158..ffdb39725 100644
          double d0 = this.moveController.c();
  
 diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
-index 9c22323c4..9162049c1 100644
+index 9c22323c47..9162049c12 100644
 --- a/src/main/java/net/minecraft/server/EntityRavager.java
 +++ b/src/main/java/net/minecraft/server/EntityRavager.java
 @@ -16,6 +16,7 @@ public class EntityRavager extends EntityRaider {
@@ -1670,7 +1744,7 @@ index 9c22323c4..9162049c1 100644
          this.f = 20;
      }
 diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java
-index b600f30eb..8c60e26c7 100644
+index b600f30eb1..8c60e26c70 100644
 --- a/src/main/java/net/minecraft/server/EntitySalmon.java
 +++ b/src/main/java/net/minecraft/server/EntitySalmon.java
 @@ -4,6 +4,7 @@ public class EntitySalmon extends EntityFishSchool {
@@ -1682,7 +1756,7 @@ index b600f30eb..8c60e26c7 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index df1bfc94e..f7d7f417c 100644
+index df1bfc94e2..f7d7f417ce 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -18,7 +18,7 @@ import org.bukkit.inventory.InventoryView;
@@ -1714,7 +1788,7 @@ index df1bfc94e..f7d7f417c 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index 1df311d85..e821efe62 100644
+index 1df311d852..e821efe62e 100644
 --- a/src/main/java/net/minecraft/server/EntityShulker.java
 +++ b/src/main/java/net/minecraft/server/EntityShulker.java
 @@ -26,6 +26,7 @@ public class EntityShulker extends EntityGolem implements IMonster {
@@ -1726,7 +1800,7 @@ index 1df311d85..e821efe62 100644
          this.aK = 180.0F;
          this.bE = null;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index d823c6b6d..0a7ec94d3 100644
+index d823c6b6d9..0a7ec94d31 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -10,6 +10,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -1738,7 +1812,7 @@ index d823c6b6d..0a7ec94d3 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
-index 0e78d5c62..908e51b63 100644
+index 0e78d5c62c..908e51b636 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
 @@ -4,6 +4,7 @@ public class EntitySkeleton extends EntitySkeletonAbstract {
@@ -1750,7 +1824,7 @@ index 0e78d5c62..908e51b63 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
-index 4ca5024f3..57c7432ab 100644
+index 4ca5024f36..57c7432abf 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 @@ -4,6 +4,7 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract {
@@ -1762,7 +1836,7 @@ index 4ca5024f3..57c7432ab 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 872f79cc6..ed03d3122 100644
+index 872f79cc67..ed03d31221 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -6,6 +6,7 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -1774,7 +1848,7 @@ index 872f79cc6..ed03d3122 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index e28c0673d..bf0819e2e 100644
+index e28c0673dd..bf0819e2e2 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -28,6 +28,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -1795,7 +1869,7 @@ index e28c0673d..bf0819e2e 100644
  
          this.setMot(vec3d.x, 0.41999998688697815D, vec3d.z);
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index fb36306b9..271b952b2 100644
+index fb36306b90..271b952b21 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -14,6 +14,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -1815,7 +1889,7 @@ index fb36306b9..271b952b2 100644
  
              for (int l = 0; l < 4; ++l) {
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index b560a8969..43b1f443d 100644
+index b560a89694..43b1f443df 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -9,6 +9,7 @@ public class EntitySpider extends EntityMonster {
@@ -1843,7 +1917,7 @@ index b560a8969..43b1f443d 100644
  
              if (f >= 0.5F && this.a.getRandom().nextInt(100) == 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 77c0ed42f..e06282fdf 100644
+index 77c0ed42f4..e06282fdff 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -19,6 +19,7 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -1921,7 +1995,7 @@ index 77c0ed42f..e06282fdf 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
-index 70bf06b94..2f41d8ade 100644
+index 70bf06b943..2f41d8ade3 100644
 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 @@ -127,6 +127,12 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -1938,7 +2012,7 @@ index 70bf06b94..2f41d8ade 100644
          this.setTamed(true);
          this.setOwnerUUID(entityhuman.getUniqueID());
 diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java
-index 2e537c203..03b49a7c7 100644
+index 2e537c2032..03b49a7c76 100644
 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java
 +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java
 @@ -17,6 +17,7 @@ public class EntityTropicalFish extends EntityFishSchool {
@@ -1950,7 +2024,7 @@ index 2e537c203..03b49a7c7 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index e4eecf568..80bd32b79 100644
+index e4eecf5688..80bd32b79e 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -22,6 +22,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -1962,7 +2036,7 @@ index e4eecf568..80bd32b79 100644
          this.bC = Blocks.SAND;
          this.K = 1.0F;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 759e8b443..3fd1f8f49 100644
+index 759e8b443c..3fd1f8f49d 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -262,6 +262,10 @@ public class EntityTypes<T extends Entity> {
@@ -1977,7 +2051,7 @@ index 759e8b443..3fd1f8f49 100644
          return getNameComponent().getString();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index bcda21ba7..0fc3bce6f 100644
+index bcda21ba71..0fc3bce6fa 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -15,6 +15,7 @@ public class EntityVex extends EntityMonster {
@@ -1989,7 +2063,7 @@ index bcda21ba7..0fc3bce6f 100644
          this.f = 3;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index fe9efa9da..6e6f9180c 100644
+index fe9efa9da1..6e6f9180c5 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -61,6 +61,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -2001,7 +2075,7 @@ index fe9efa9da..6e6f9180c 100644
          this.bL = new Reputation();
          ((Navigation) this.getNavigation()).a(true);
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 46a349e73..b029c38d2 100644
+index 46a349e73a..b029c38d2c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -17,6 +17,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -2013,7 +2087,7 @@ index 46a349e73..b029c38d2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 130a2e4ff..88a2ace08 100644
+index 130a2e4ffe..88a2ace08b 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -15,6 +15,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -2025,7 +2099,7 @@ index 130a2e4ff..88a2ace08 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index f30ce9568..6a0d7a82f 100644
+index f30ce95686..6a0d7a82f9 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -22,6 +22,7 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -2037,7 +2111,7 @@ index f30ce9568..6a0d7a82f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 5609fcfe0..51624ac8a 100644
+index 5609fcfe00..51624ac8a8 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -35,6 +35,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -2049,7 +2123,7 @@ index 5609fcfe0..51624ac8a 100644
          this.setHealth(this.getMaxHealth());
          this.getNavigation().d(true);
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 0f4554c39..dd213c7d9 100644
+index 0f4554c394..dd213c7d9a 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -28,6 +28,7 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -2061,7 +2135,7 @@ index 0f4554c39..dd213c7d9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 40a796384..a131d57b5 100644
+index 40a796384c..a131d57b5b 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -35,6 +35,7 @@ public class EntityZombie extends EntityMonster {
@@ -2073,7 +2147,7 @@ index 40a796384..a131d57b5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 1c0787429..0b5875e93 100644
+index 1c07874294..0b5875e93f 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -4,6 +4,7 @@ public class EntityZombieHusk extends EntityZombie {
@@ -2085,7 +2159,7 @@ index 1c0787429..0b5875e93 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 5cfda3160..ac460de59 100644
+index 5cfda3160b..ac460de59c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -20,6 +20,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -2097,7 +2171,7 @@ index 5cfda3160..ac460de59 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java
-index 08aea9969..c6e9b044f 100644
+index 08aea9969d..c6e9b044f7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java
 @@ -37,6 +37,7 @@ public class PathfinderGoalArrowAttack extends PathfinderGoal {
@@ -2117,7 +2191,7 @@ index 08aea9969..c6e9b044f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java
-index 6e299144c..3571db9aa 100644
+index 6e299144c6..3571db9aaf 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java
 @@ -18,12 +18,7 @@ public class PathfinderGoalAvoidTarget<T extends EntityLiving> extends Pathfinde
@@ -2151,7 +2225,7 @@ index 6e299144c..3571db9aa 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBeg.java b/src/main/java/net/minecraft/server/PathfinderGoalBeg.java
-index d5935715f..66216ea8c 100644
+index d5935715f0..66216ea8ce 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBeg.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBeg.java
 @@ -21,12 +21,14 @@ public class PathfinderGoalBeg extends PathfinderGoal {
@@ -2170,7 +2244,7 @@ index d5935715f..66216ea8c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java b/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java
-index 5bdc4b4b6..fd2c1dd59 100644
+index 5bdc4b4b61..fd2c1dd59f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java
 @@ -28,6 +28,7 @@ public class PathfinderGoalBowShoot<T extends EntityMonster & IRangedEntity> ext
@@ -2190,7 +2264,7 @@ index 5bdc4b4b6..fd2c1dd59 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java
-index 7f12d9291..e8a161c3e 100644
+index 7f12d92915..e8a161c3ed 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java
 @@ -27,6 +27,7 @@ public class PathfinderGoalBreakDoor extends PathfinderGoalDoorInteract {
@@ -2210,7 +2284,7 @@ index 7f12d9291..e8a161c3e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 9d0b1ffef..88fcf4123 100644
+index 9d0b1ffefa..88fcf41230 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -29,16 +29,18 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -2234,7 +2308,7 @@ index 9d0b1ffef..88fcf4123 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java b/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java
-index 8a251cb00..d4754a8c0 100644
+index 8a251cb00f..d4754a8c01 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java
 @@ -15,6 +15,7 @@ public class PathfinderGoalCatSitOnBed extends PathfinderGoalGotoTarget {
@@ -2246,7 +2320,7 @@ index 8a251cb00..d4754a8c0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java
-index 2e7e4f560..dfd69b998 100644
+index 2e7e4f560c..dfd69b9988 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java
 @@ -21,6 +21,7 @@ public class PathfinderGoalCrossbowAttack<T extends EntityMonster & IRangedEntit
@@ -2266,7 +2340,7 @@ index 2e7e4f560..dfd69b998 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalDefendVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalDefendVillage.java
-index 9a67f5b55..0b80e8d48 100644
+index 9a67f5b555..0b80e8d489 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalDefendVillage.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalDefendVillage.java
 @@ -18,6 +18,7 @@ public class PathfinderGoalDefendVillage extends PathfinderGoalTarget {
@@ -2278,7 +2352,7 @@ index 9a67f5b55..0b80e8d48 100644
          List<EntityLiving> list = this.a.world.a(EntityVillager.class, this.c, this.a, axisalignedbb);
          List<EntityHuman> list1 = this.a.world.a(this.c, (EntityLiving) this.a, axisalignedbb);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java b/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java
-index e4088249c..d5d06c85d 100644
+index e4088249c0..d5d06c85db 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java
 @@ -45,6 +45,7 @@ public abstract class PathfinderGoalDoorInteract extends PathfinderGoal {
@@ -2298,7 +2372,7 @@ index e4088249c..d5d06c85d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java b/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java
-index 420ef53e4..987b15ffe 100644
+index 420ef53e4a..987b15ffea 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java
 @@ -13,6 +13,7 @@ public class PathfinderGoalDoorOpen extends PathfinderGoalDoorInteract {
@@ -2310,7 +2384,7 @@ index 420ef53e4..987b15ffe 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java b/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java
-index 43d5a4b44..b08a07693 100644
+index 43d5a4b44b..b08a07693a 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java
 @@ -22,6 +22,7 @@ public class PathfinderGoalEatTile extends PathfinderGoal {
@@ -2330,7 +2404,7 @@ index 43d5a4b44..b08a07693 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java b/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java
-index 559a5dfe0..5f47cd566 100644
+index 559a5dfe03..5f47cd5667 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java
 @@ -20,6 +20,7 @@ public class PathfinderGoalFishSchool extends PathfinderGoal {
@@ -2350,7 +2424,7 @@ index 559a5dfe0..5f47cd566 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java b/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java
-index b18f7c516..ecb48fe45 100644
+index b18f7c516a..ecb48fe459 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java
 @@ -22,6 +22,7 @@ public class PathfinderGoalFleeSun extends PathfinderGoal {
@@ -2370,7 +2444,7 @@ index b18f7c516..ecb48fe45 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java
-index 7fac14fb6..845cb071b 100644
+index 7fac14fb66..845cb071b7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java
 @@ -16,6 +16,7 @@ public class PathfinderGoalFollowBoat extends PathfinderGoal {
@@ -2390,7 +2464,7 @@ index 7fac14fb6..845cb071b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java
-index 1d19ffee9..5fc43105b 100644
+index 1d19ffee9d..5fc43105b5 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java
 @@ -34,6 +34,7 @@ public class PathfinderGoalFollowEntity extends PathfinderGoal {
@@ -2410,7 +2484,7 @@ index 1d19ffee9..5fc43105b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java
-index 896d2d56a..55318e137 100644
+index 896d2d56aa..55318e137a 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java
 @@ -34,6 +34,7 @@ public class PathfinderGoalFollowOwner extends PathfinderGoal {
@@ -2430,7 +2504,7 @@ index 896d2d56a..55318e137 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java
-index 63b7777c0..78b3d63c1 100644
+index 63b7777c08..78b3d63c13 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java
 @@ -17,6 +17,7 @@ public class PathfinderGoalFollowParent extends PathfinderGoal {
@@ -2450,7 +2524,7 @@ index 63b7777c0..78b3d63c1 100644
              return false;
          } else if (!this.b.isAlive()) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index 5c2b7b0a5..6f2d0ce7b 100644
+index 5c2b7b0a5a..6f2d0ce7b6 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -31,6 +31,7 @@ public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
@@ -2470,7 +2544,7 @@ index 5c2b7b0a5..6f2d0ce7b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index f09374413..32176bbf2 100644
+index f093744136..32176bbf2a 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -10,6 +10,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -2482,7 +2556,7 @@ index f09374413..32176bbf2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java
-index dc9652a5e..3b5989ddb 100644
+index dc9652a5ef..3b5989ddbc 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java
 @@ -20,6 +20,7 @@ public class PathfinderGoalHurtByTarget extends PathfinderGoalTarget {
@@ -2494,7 +2568,7 @@ index dc9652a5e..3b5989ddb 100644
          EntityLiving entityliving = this.e.getLastDamager();
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java
-index 84d2cf8df..856a79653 100644
+index 84d2cf8df6..856a796534 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java
 @@ -11,6 +11,7 @@ public class PathfinderGoalJumpOnBlock extends PathfinderGoalGotoTarget {
@@ -2506,7 +2580,7 @@ index 84d2cf8df..856a79653 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java
-index b89d16136..08767e28b 100644
+index b89d161360..08767e28b4 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java
 @@ -16,6 +16,7 @@ public class PathfinderGoalLeapAtTarget extends PathfinderGoal {
@@ -2526,7 +2600,7 @@ index b89d16136..08767e28b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
-index a46a985a6..7bc900b82 100644
+index a46a985a65..7bc900b828 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 @@ -18,6 +18,7 @@ public class PathfinderGoalLlamaFollow extends PathfinderGoal {
@@ -2546,7 +2620,7 @@ index a46a985a6..7bc900b82 100644
              double d0 = this.a.h((Entity) this.a.eJ());
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java
-index 614a8471d..a57752bd2 100644
+index 614a8471da..a57752bd24 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java
 @@ -34,6 +34,7 @@ public class PathfinderGoalLookAtPlayer extends PathfinderGoal {
@@ -2566,7 +2640,7 @@ index 614a8471d..a57752bd2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java
-index 4f1328cd3..85da00154 100644
+index 4f1328cd38..85da00154b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java
 @@ -11,6 +11,7 @@ public class PathfinderGoalLookAtTradingPlayer extends PathfinderGoalLookAtPlaye
@@ -2578,7 +2652,7 @@ index 4f1328cd3..85da00154 100644
              this.b = this.f.getTrader();
              return true;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java
-index 702a75087..6d49d8437 100644
+index 702a75087c..6d49d8437d 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java
 @@ -25,6 +25,7 @@ public class PathfinderGoalMeleeAttack extends PathfinderGoal {
@@ -2598,7 +2672,7 @@ index 702a75087..6d49d8437 100644
  
          return entityliving == null ? false : (!entityliving.isAlive() ? false : (!this.e ? !this.a.getNavigation().n() : (!this.a.a(new BlockPosition(entityliving)) ? false : !(entityliving instanceof EntityHuman) || !entityliving.isSpectator() && !((EntityHuman) entityliving).isCreative())));
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java
-index 51bb1d5de..f57c4447e 100644
+index 51bb1d5de8..f57c4447ed 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java
 @@ -33,6 +33,7 @@ public class PathfinderGoalMoveThroughVillage extends PathfinderGoal {
@@ -2618,7 +2692,7 @@ index 51bb1d5de..f57c4447e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java
-index 7954444a6..5c753ee7c 100644
+index 7954444a64..5c753ee7cf 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java
 @@ -18,6 +18,7 @@ public class PathfinderGoalMoveTowardsRestriction extends PathfinderGoal {
@@ -2638,7 +2712,7 @@ index 7954444a6..5c753ee7c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java
-index c38aedf62..32bd2e1ee 100644
+index c38aedf623..32bd2e1ee1 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java
 @@ -21,6 +21,7 @@ public class PathfinderGoalMoveTowardsTarget extends PathfinderGoal {
@@ -2658,7 +2732,7 @@ index c38aedf62..32bd2e1ee 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-index 53399e311..d03130fcf 100644
+index 53399e3115..d03130fcfd 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
 @@ -29,6 +29,7 @@ public class PathfinderGoalNearestAttackableTarget<T extends EntityLiving> exten
@@ -2670,7 +2744,7 @@ index 53399e311..d03130fcf 100644
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java
-index 579dc99df..5dc3f7a2d 100644
+index 579dc99df0..5dc3f7a2d1 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java
 @@ -17,6 +17,7 @@ public class PathfinderGoalNearestAttackableTargetWitch<T extends EntityLiving>
@@ -2682,7 +2756,7 @@ index 579dc99df..5dc3f7a2d 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java
-index 90eed77e1..87b9df53b 100644
+index 90eed77e18..87b9df53b0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java
 @@ -21,6 +21,7 @@ public class PathfinderGoalNearestHealableRaider<T extends EntityLiving> extends
@@ -2694,7 +2768,7 @@ index 90eed77e1..87b9df53b 100644
              if (!((EntityRaider) this.e).el()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java
-index 39789afcf..68bf134c7 100644
+index 39789afcfc..68bf134c71 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java
 @@ -19,6 +19,7 @@ public class PathfinderGoalNearestVillage extends PathfinderGoal {
@@ -2714,7 +2788,7 @@ index 39789afcf..68bf134c7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java
-index bf52ecc40..2bb7e0c1e 100644
+index bf52ecc401..2bb7e0c1e8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java
 @@ -17,6 +17,7 @@ public class PathfinderGoalOcelotAttack extends PathfinderGoal {
@@ -2734,7 +2808,7 @@ index bf52ecc40..2bb7e0c1e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java b/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java
-index 59822905a..f35318926 100644
+index 59822905a5..f35318926b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java
 @@ -16,6 +16,7 @@ public class PathfinderGoalOfferFlower extends PathfinderGoal {
@@ -2754,7 +2828,7 @@ index 59822905a..f35318926 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java
-index 3b3274ae5..dcc8f04be 100644
+index 3b3274ae5e..dcc8f04be5 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java
 @@ -16,6 +16,7 @@ public class PathfinderGoalOwnerHurtByTarget extends PathfinderGoalTarget {
@@ -2766,7 +2840,7 @@ index 3b3274ae5..dcc8f04be 100644
              EntityLiving entityliving = this.a.getOwner();
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java
-index eca8d3236..63cfd57d8 100644
+index eca8d32368..63cfd57d89 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java
 @@ -16,6 +16,7 @@ public class PathfinderGoalOwnerHurtTarget extends PathfinderGoalTarget {
@@ -2778,7 +2852,7 @@ index eca8d3236..63cfd57d8 100644
              EntityLiving entityliving = this.a.getOwner();
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java
-index f399683b7..33b616a60 100644
+index f399683b74..33b616a601 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java
 @@ -19,6 +19,7 @@ public class PathfinderGoalPanic extends PathfinderGoal {
@@ -2798,7 +2872,7 @@ index f399683b7..33b616a60 100644
          if ((this.a.ticksLived - this.a.hurtTimestamp) > 100) {
              this.a.setLastDamager((EntityLiving) null);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalPerch.java b/src/main/java/net/minecraft/server/PathfinderGoalPerch.java
-index af4dc4345..de33a50ab 100644
+index af4dc4345d..de33a50aba 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalPerch.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalPerch.java
 @@ -12,6 +12,7 @@ public class PathfinderGoalPerch extends PathfinderGoal {
@@ -2810,7 +2884,7 @@ index af4dc4345..de33a50ab 100644
          boolean flag = entityplayer != null && !entityplayer.isSpectator() && !entityplayer.abilities.isFlying && !entityplayer.isInWater();
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRaid.java b/src/main/java/net/minecraft/server/PathfinderGoalRaid.java
-index 51d101f11..757144814 100644
+index 51d101f11c..7571448141 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRaid.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRaid.java
 @@ -18,11 +18,13 @@ public class PathfinderGoalRaid<T extends EntityRaider> extends PathfinderGoal {
@@ -2828,7 +2902,7 @@ index 51d101f11..757144814 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java
-index 316205ebf..8cc9f4fe1 100644
+index 316205ebfa..8cc9f4fe13 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java
 @@ -16,11 +16,13 @@ public class PathfinderGoalRandomLookaround extends PathfinderGoal {
@@ -2846,7 +2920,7 @@ index 316205ebf..8cc9f4fe1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java
-index e92eb3019..4b7c33af5 100644
+index e92eb3019d..4b7c33af57 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java
 @@ -26,6 +26,7 @@ public class PathfinderGoalRandomStroll extends PathfinderGoal {
@@ -2866,7 +2940,7 @@ index e92eb3019..4b7c33af5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java
-index f572f3367..218c35bf7 100644
+index f572f33673..218c35bf77 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java
 @@ -14,11 +14,13 @@ public class PathfinderGoalRandomTargetNonTamed<T extends EntityLiving> extends
@@ -2884,7 +2958,7 @@ index f572f3367..218c35bf7 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index b1457526e..c0dd24d33 100644
+index b1457526ec..c0dd24d338 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -23,6 +23,7 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -2896,7 +2970,7 @@ index b1457526e..c0dd24d33 100644
              return false;
          } else if (this.c > 0) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java b/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java
-index e964907b0..b8fa65560 100644
+index e964907b05..b8fa65560c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java
 @@ -10,6 +10,7 @@ public class PathfinderGoalRestrictSun extends PathfinderGoal {
@@ -2908,7 +2982,7 @@ index e964907b0..b8fa65560 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSit.java b/src/main/java/net/minecraft/server/PathfinderGoalSit.java
-index 211602083..cdb1393bf 100644
+index 2116020832..cdb1393bfd 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSit.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSit.java
 @@ -14,11 +14,13 @@ public class PathfinderGoalSit extends PathfinderGoal {
@@ -2926,7 +3000,7 @@ index 211602083..cdb1393bf 100644
              return this.willSit && this.entity.getGoalTarget() == null; // CraftBukkit - Allow sitting for wild animals
          } else if (this.entity.au()) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java
-index 3a081935f..9e0c58629 100644
+index 3a081935fa..9e0c58629c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java
 @@ -10,6 +10,7 @@ public class PathfinderGoalStrollVillage extends PathfinderGoalRandomStroll {
@@ -2938,7 +3012,7 @@ index 3a081935f..9e0c58629 100644
          BlockPosition blockposition = new BlockPosition(this.a);
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTame.java b/src/main/java/net/minecraft/server/PathfinderGoalTame.java
-index fc426365d..e98577f21 100644
+index fc426365d2..e98577f218 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTame.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTame.java
 @@ -18,6 +18,7 @@ public class PathfinderGoalTame extends PathfinderGoal {
@@ -2958,7 +3032,7 @@ index fc426365d..e98577f21 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java
-index 95afc8eee..59a50e549 100644
+index 95afc8eeec..59a50e5499 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java
 @@ -27,6 +27,7 @@ public abstract class PathfinderGoalTarget extends PathfinderGoal {
@@ -2970,7 +3044,7 @@ index 95afc8eee..59a50e549 100644
  
          if (entityliving == null) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index d1164dd68..26efba12b 100644
+index d1164dd682..26efba12b8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -41,6 +41,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -2990,7 +3064,7 @@ index d1164dd68..26efba12b 100644
              if (this.a.h((Entity) this.target) < 36.0D) {
                  if (this.target.e(this.e, this.f, this.g) > 0.010000000000000002D) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java
-index 9d37bd1a8..0ead41f0d 100644
+index 9d37bd1a8a..0ead41f0dd 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java
 @@ -13,6 +13,7 @@ public class PathfinderGoalTradeWithPlayer extends PathfinderGoal {
@@ -3002,7 +3076,7 @@ index 9d37bd1a8..0ead41f0d 100644
              return false;
          } else if (this.a.isInWater()) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java b/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java
-index e6c5b968b..c9f3680ba 100644
+index e6c5b968b1..c9f3680ba3 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java
 @@ -19,11 +19,13 @@ public class PathfinderGoalUseItem<T extends EntityInsentient> extends Pathfinde
@@ -3020,7 +3094,7 @@ index e6c5b968b..c9f3680ba 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWater.java b/src/main/java/net/minecraft/server/PathfinderGoalWater.java
-index 65b6bcdbd..fbc36ff7a 100644
+index 65b6bcdbde..fbc36ff7ae 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWater.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWater.java
 @@ -12,6 +12,7 @@ public class PathfinderGoalWater extends PathfinderGoal {
@@ -3032,7 +3106,7 @@ index 65b6bcdbd..fbc36ff7a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java b/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java
-index a2fc2cd80..8f064526b 100644
+index a2fc2cd802..8f064526b2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java
 @@ -14,6 +14,7 @@ public class PathfinderGoalWaterJump extends PathfinderGoalWaterJumpAbstract {
@@ -3052,7 +3126,7 @@ index a2fc2cd80..8f064526b 100644
  
          return (d0 * d0 >= 0.029999999329447746D || this.b.pitch == 0.0F || Math.abs(this.b.pitch) >= 10.0F || !this.b.isInWater()) && !this.b.onGround;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8f3367ae1..77c1d3e89 100644
+index 8f3367ae1d..77c1d3e897 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -103,6 +103,11 @@ public class PurpurConfig {
@@ -3191,7 +3265,7 @@ index 8f3367ae1..77c1d3e89 100644
  }
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 new file mode 100644
-index 000000000..99e184d36
+index 0000000000..99e184d36e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 @@ -0,0 +1,74 @@
@@ -3271,7 +3345,7 @@ index 000000000..99e184d36
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 new file mode 100644
-index 000000000..d64a66274
+index 0000000000..d64a66274b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 @@ -0,0 +1,77 @@
@@ -3354,7 +3428,7 @@ index 000000000..d64a66274
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 new file mode 100644
-index 000000000..b0b504c7d
+index 0000000000..b0b504c7dc
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 @@ -0,0 +1,62 @@
@@ -3422,7 +3496,7 @@ index 000000000..b0b504c7d
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 new file mode 100644
-index 000000000..a353069b7
+index 0000000000..a353069b78
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 @@ -0,0 +1,65 @@
@@ -3493,7 +3567,7 @@ index 000000000..a353069b7
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 new file mode 100644
-index 000000000..74ff48259
+index 0000000000..74ff48259c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 @@ -0,0 +1,42 @@
@@ -3540,7 +3614,7 @@ index 000000000..74ff48259
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 98f62d776..83eeab5c3 100644
+index 98f62d7760..83eeab5c37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -710,5 +710,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -3560,7 +3634,7 @@ index 98f62d776..83eeab5c3 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 56c233872..b19970c88 100644
+index 56c233872b..b19970c883 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -75,4 +75,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {