diff --git a/Paper b/Paper
index 0d079188e..c8bc57c71 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 0d079188ea0f7edd2413e0de0410cac5bdd487d3
+Subproject commit c8bc57c71946aa8bde7088a5753d931d6a9adf21
diff --git a/current-paper b/current-paper
index 7569ce0a3..09b9dfafa 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14.3--8a09ec0597392dd0a130182fb18bf9c6eeaa5ac2
+1.14.3--5751c8a21dea9a9437cec168280856bbb35e8550
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 3fa5292b9..4a849ed15 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -1,4 +1,4 @@
-From 1ab49ab58a72b1c39551fac290c62791c1a0223d Mon Sep 17 00:00:00 2001
+From 2e9eb1dadfd676fce0e6e5a18cb5e80722cdf531 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -325,10 +325,10 @@ index 000000000..30f11fe26
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bb5aa677c..9eccb787f 100644
+index 6dfdc9813..6a9786eb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -791,6 +791,7 @@ public final class CraftServer implements Server {
+@@ -793,6 +793,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -336,7 +336,7 @@ index bb5aa677c..9eccb787f 100644
          for (WorldServer world : console.getWorlds()) {
              world.worldData.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -807,6 +808,7 @@ public final class CraftServer implements Server {
+@@ -809,6 +810,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
diff --git a/patches/server/0011-Integrate-ridables.patch b/patches/server/0011-Integrate-ridables.patch
index 994a444dc..5f37516a1 100644
--- a/patches/server/0011-Integrate-ridables.patch
+++ b/patches/server/0011-Integrate-ridables.patch
@@ -1,4 +1,4 @@
-From a467968ed0cd18565c3c27a9a612dc6305722436 Mon Sep 17 00:00:00 2001
+From 441f9a8e1bf19a33fae42367b81fb2d08f83ba01 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
@@ -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 454627f65e..df3d6cf281 100644
+index 454627f65..df3d6cf28 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 454627f65e..df3d6cf281 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 485da37a73..ca429be7db 100644
+index c10b41dff..e8b5729ef 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
@@ -221,7 +221,7 @@ index 485da37a73..ca429be7db 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -3272,4 +3287,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3275,4 +3290,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public void setMot(double d0, double d1, double d2) {
          this.setMot(new Vec3D(d0, d1, d2));
      }
@@ -243,7 +243,7 @@ index 485da37a73..ca429be7db 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index e87754ef33..553245ebe9 100644
+index e87754ef3..553245ebe 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 {
@@ -256,7 +256,7 @@ index e87754ef33..553245ebe9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index e5d8fe2534..7b9dff70e3 100644
+index e5d8fe253..7b9dff70e 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -4,6 +4,7 @@ import java.time.LocalDate;
@@ -308,7 +308,7 @@ index e5d8fe2534..7b9dff70e3 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
-index 89f1bfa41d..6dba5eecc8 100644
+index 89f1bfa41..6dba5eecc 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 {
@@ -355,7 +355,7 @@ index 89f1bfa41d..6dba5eecc8 100644
  
              return entityliving != null && entityliving.isAlive() && this.a.c(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index feb3e4b59d..51c1f30a47 100644
+index feb3e4b59..51c1f30a4 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 {
@@ -477,7 +477,7 @@ index feb3e4b59d..51c1f30a47 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
-index 89c9306df5..e9ec283625 100644
+index 89c9306df..e9ec28362 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 {
@@ -489,7 +489,7 @@ index 89c9306df5..e9ec283625 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index f1dfdd4ff8..6342c4cd23 100644
+index f1dfdd4ff..6342c4cd2 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 {
@@ -510,7 +510,7 @@ index f1dfdd4ff8..6342c4cd23 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 1e3782122a..c0b066d188 100644
+index 1e3782122..c0b066d18 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 {
@@ -522,7 +522,7 @@ index 1e3782122a..c0b066d188 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index f053ff0e50..16a35418f2 100644
+index f053ff0e5..16a35418f 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 {
@@ -534,10 +534,10 @@ index f053ff0e50..16a35418f2 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 6bb63b9f90..a8ef0c0223 100644
+index fd3f53e90..8db6405ff 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 {
+@@ -21,6 +21,7 @@ public class EntityCreeper extends EntityMonster {
  
      public EntityCreeper(EntityTypes<? extends EntityCreeper> entitytypes, World world) {
          super(entitytypes, world);
@@ -545,7 +545,7 @@ index 6bb63b9f90..a8ef0c0223 100644
      }
  
      @Override
-@@ -274,4 +275,59 @@ public class EntityCreeper extends EntityMonster {
+@@ -275,4 +276,59 @@ public class EntityCreeper extends EntityMonster {
      public void setCausedHeadDrop() {
          ++this.bD;
      }
@@ -606,7 +606,7 @@ index 6bb63b9f90..a8ef0c0223 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
-index 662624b727..9a3b46b4b9 100644
+index 662624b72..9a3b46b4b 100644
 --- a/src/main/java/net/minecraft/server/EntityDolphin.java
 +++ b/src/main/java/net/minecraft/server/EntityDolphin.java
 @@ -18,6 +18,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -687,7 +687,7 @@ index 662624b727..9a3b46b4b9 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 158c05d1e1..4422d19751 100644
+index 158c05d1e..4422d1975 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 {
@@ -792,7 +792,7 @@ index 158c05d1e1..4422d19751 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index bec173e411..72226d4c4d 100644
+index bec173e41..72226d4c4 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 {
@@ -804,7 +804,7 @@ index bec173e411..72226d4c4d 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 0989c07cf5..f551192a04 100644
+index 0989c07cf..f551192a0 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 {
@@ -856,7 +856,7 @@ index 0989c07cf5..f551192a04 100644
                  if (!this.i.f(this.j)) {
                      return false;
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index 41107e9784..6d04a4ee49 100644
+index 41107e978..6d04a4ee4 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -10,6 +10,7 @@ public class EntityEndermite extends EntityMonster {
@@ -877,7 +877,7 @@ index 41107e9784..6d04a4ee49 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 96dab0a46b..ae0e134d9b 100644
+index 96dab0a46..ae0e134d9 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 {
@@ -922,7 +922,7 @@ index 96dab0a46b..ae0e134d9b 100644
                  return false;
              } else {
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index 2b97e92eb4..b857b08821 100644
+index 2b97e92eb..b857b0882 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -73,11 +73,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -983,7 +983,7 @@ index 2b97e92eb4..b857b08821 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index f9ba3b8561..4876289992 100644
+index f9ba3b856..487628999 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 {
@@ -1302,7 +1302,7 @@ index f9ba3b8561..4876289992 100644
                  return false;
              } else if (EntityFox.this.getGoalTarget() == null && EntityFox.this.getLastDamager() == null) {
 diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
-index bf29faa8a3..54899d2990 100644
+index bf29faa8a..54899d299 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 {
@@ -1356,7 +1356,7 @@ index bf29faa8a3..54899d2990 100644
                  if (this.j-- <= 0) {
                      this.j += this.i.getRandom().nextInt(5) + 2;
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index bcbade19ea..b7e2022b19 100644
+index bcbade19e..b7e2022b1 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 {
@@ -1370,7 +1370,7 @@ index bcbade19ea..b7e2022b19 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
-index 31db5b5254..6c46756d49 100644
+index 31db5b525..6c46756d4 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardian.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardian.java
 @@ -23,8 +23,15 @@ public class EntityGuardian extends EntityMonster {
@@ -1452,7 +1452,7 @@ index 31db5b5254..6c46756d49 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java
-index cf53c7a3a1..99eab220c2 100644
+index cf53c7a3a..99eab220c 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 {
@@ -1464,7 +1464,7 @@ index cf53c7a3a1..99eab220c2 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 e08eaddef3..6f4e9ed1af 100644
+index e08eaddef..6f4e9ed1a 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
@@ -1479,7 +1479,7 @@ index e08eaddef3..6f4e9ed1af 100644
          this.loadChest();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 61da5d365d..8b1f56acc2 100644
+index 61da5d365..8b1f56acc 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 {
@@ -1506,7 +1506,7 @@ index 61da5d365d..8b1f56acc2 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 76641682b1..8c33634726 100644
+index 76641682b..8c3363472 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
@@ -1534,7 +1534,7 @@ index 76641682b1..8c33634726 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerWizard.java b/src/main/java/net/minecraft/server/EntityIllagerWizard.java
-index 7e0f55d725..0f498df5bd 100644
+index 7e0f55d72..0f498df5b 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerWizard.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerWizard.java
 @@ -115,6 +115,7 @@ public abstract class EntityIllagerWizard extends EntityIllagerAbstract {
@@ -1562,7 +1562,7 @@ index 7e0f55d725..0f498df5bd 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index c73d2ff5da..94f43b1e0d 100644
+index c73d2ff5d..94f43b1e0 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -10,6 +10,7 @@ import java.util.UUID;
@@ -1657,7 +1657,7 @@ index c73d2ff5da..94f43b1e0d 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 8e463111bb..fd6a926cae 100644
+index 8e463111b..fd6a926ca 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 {
@@ -1669,7 +1669,7 @@ index 8e463111bb..fd6a926cae 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c2d83bf3eb..694200deb2 100644
+index c2d83bf3e..694200deb 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 {
@@ -1746,7 +1746,7 @@ index c2d83bf3eb..694200deb2 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 a17316c77a..b34a258c22 100644
+index a17316c77..b34a258c2 100644
 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java
 +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java
 @@ -6,6 +6,7 @@ public class EntityMagmaCube extends EntitySlime {
@@ -1767,7 +1767,7 @@ index a17316c77a..b34a258c22 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 6bfffb4077..b6d5fe3623 100644
+index 6bfffb407..b6d5fe362 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -18,6 +18,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -1779,7 +1779,7 @@ index 6bfffb4077..b6d5fe3623 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 0f1c259595..4d9bf81bff 100644
+index 0f1c25959..4d9bf81bf 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -14,6 +14,7 @@ public class EntityOcelot extends EntityAnimal {
@@ -1805,7 +1805,7 @@ index 0f1c259595..4d9bf81bff 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index 2bec33d8ad..cc729ef33e 100644
+index 2bec33d8a..cc729ef33 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 {
@@ -2008,7 +2008,7 @@ index 2bec33d8ad..cc729ef33e 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 94e973ffba..d743ddb9c5 100644
+index 94e973ffb..d743ddb9c 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 {
@@ -2031,7 +2031,7 @@ index 94e973ffba..d743ddb9c5 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index ea11de3cb3..8517fcf293 100644
+index ea11de3cb..8517fcf29 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 {
@@ -2186,7 +2186,7 @@ index ea11de3cb3..8517fcf293 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 0d099d2fd6..fd7c5136f1 100644
+index 0d099d2fd..fd7c5136f 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 {
@@ -2240,7 +2240,7 @@ index 0d099d2fd6..fd7c5136f1 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 151eef84ac..786592da12 100644
+index 151eef84a..786592da1 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -14,6 +14,7 @@ public class EntityPigZombie extends EntityZombie {
@@ -2269,7 +2269,7 @@ index 151eef84ac..786592da12 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
-index 90a0464102..e7c31ff5af 100644
+index 90a046410..e7c31ff5a 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,
@@ -2281,7 +2281,7 @@ index 90a0464102..e7c31ff5af 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 3516fe7645..8389ea1237 100644
+index 3516fe764..8389ea123 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -15,6 +15,7 @@ public class EntityPolarBear extends EntityAnimal {
@@ -2360,7 +2360,7 @@ index 3516fe7645..8389ea1237 100644
                  return false;
              } else {
 diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
-index f5d384adda..175e43f7fe 100644
+index f5d384add..175e43f7f 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 {
@@ -2388,7 +2388,7 @@ index f5d384adda..175e43f7fe 100644
  
              return !list.isEmpty();
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 76394603c3..821f9300e2 100644
+index 76394603c..821f9300e 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -15,6 +15,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -2409,7 +2409,7 @@ index 76394603c3..821f9300e2 100644
          double d0 = this.moveController.c();
  
 diff --git a/src/main/java/net/minecraft/server/EntityRaider.java b/src/main/java/net/minecraft/server/EntityRaider.java
-index dccd098d41..709a4c77df 100644
+index dccd098d4..709a4c77d 100644
 --- a/src/main/java/net/minecraft/server/EntityRaider.java
 +++ b/src/main/java/net/minecraft/server/EntityRaider.java
 @@ -278,6 +278,7 @@ public abstract class EntityRaider extends EntityMonsterPatrolling {
@@ -2453,7 +2453,7 @@ index dccd098d41..709a4c77df 100644
  
              if (this.b.el() && !this.b.ek().a() && this.b.dY() && !ItemStack.matches(this.b.getEquipment(EnumItemSlot.HEAD), Raid.s())) {
 diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
-index dc8bac5530..9a1ae546e3 100644
+index dc8bac553..9a1ae546e 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 {
@@ -2465,7 +2465,7 @@ index dc8bac5530..9a1ae546e3 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 725806f163..4ee2b012fe 100644
+index 725806f16..4ee2b012f 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 {
@@ -2477,7 +2477,7 @@ index 725806f163..4ee2b012fe 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index a3daceb856..1a6e934522 100644
+index a3daceb85..1a6e93452 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;
@@ -2509,7 +2509,7 @@ index a3daceb856..1a6e934522 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index a1c018b14a..39b8591ae5 100644
+index a1c018b14..39b8591ae 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 {
@@ -2559,7 +2559,7 @@ index a1c018b14a..39b8591ae5 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 2979cc8b66..4bb086323d 100644
+index 2979cc8b6..4bb086323 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 {
@@ -2595,7 +2595,7 @@ index 2979cc8b66..4bb086323d 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
-index 0e78d5c62c..908e51b636 100644
+index 0e78d5c62..908e51b63 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 {
@@ -2607,7 +2607,7 @@ index 0e78d5c62c..908e51b636 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
-index de2a5240df..f094e285ad 100644
+index de2a5240d..f094e285a 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 @@ -6,6 +6,7 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract {
@@ -2619,7 +2619,7 @@ index de2a5240df..f094e285ad 100644
  
      public static boolean b(EntityTypes<EntitySkeletonStray> entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 9abc14a481..bc08bb6168 100644
+index 9abc14a48..bc08bb616 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 {
@@ -2631,7 +2631,7 @@ index 9abc14a481..bc08bb6168 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index a59b66e663..2feb9d67b4 100644
+index a59b66e66..2feb9d67b 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -29,6 +29,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -2652,7 +2652,7 @@ index a59b66e663..2feb9d67b4 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 e106b1dce4..cee9bd6832 100644
+index e106b1dce..cee9bd683 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 {
@@ -2672,7 +2672,7 @@ index e106b1dce4..cee9bd6832 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 3929c86f8b..a3b24cdc63 100644
+index 3929c86f8..a3b24cdc6 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 {
@@ -2706,7 +2706,7 @@ index 3929c86f8b..a3b24cdc63 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 bcea73a40b..abc6210d7f 100644
+index bcea73a40..abc6210d7 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -21,6 +21,7 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -2792,7 +2792,7 @@ index bcea73a40b..abc6210d7f 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
-index 1c6b36769b..358a6edaf6 100644
+index 1c6b36769..358a6edaf 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 {
@@ -2809,7 +2809,7 @@ index 1c6b36769b..358a6edaf6 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 2e537c2032..03b49a7c76 100644
+index 2e537c203..03b49a7c7 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 {
@@ -2821,7 +2821,7 @@ index 2e537c2032..03b49a7c76 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 0037d13806..02a21641ca 100644
+index 0037d1380..02a21641c 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 {
@@ -2925,7 +2925,7 @@ index 0037d13806..02a21641ca 100644
                  return false;
              } else {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index ec63f1dbe1..4aac81d3a5 100644
+index ec63f1dbe..4aac81d3a 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> {
@@ -2940,7 +2940,7 @@ index ec63f1dbe1..4aac81d3a5 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 47fceb57ee..8c13c78b5f 100644
+index 47fceb57e..8c13c78b5 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 {
@@ -3007,7 +3007,7 @@ index 47fceb57ee..8c13c78b5f 100644
                  Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX, this.c - EntityVex.this.locY, this.d - EntityVex.this.locZ);
                  double d0 = vec3d.f();
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 44531af417..7be42a4710 100644
+index 44531af41..7be42a471 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 {
@@ -3043,7 +3043,7 @@ index 44531af417..7be42a4710 100644
  
              return entityvindicator.el() && entityvindicator.random.nextInt(10) == 0 && super.a();
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 9fea750248..66b336ee6a 100644
+index 9fea75024..66b336ee6 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 {
@@ -3055,7 +3055,7 @@ index 9fea750248..66b336ee6a 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index b3c7f8814c..374ed9a3aa 100644
+index b3c7f8814..374ed9a3a 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 {
@@ -3075,7 +3075,7 @@ index b3c7f8814c..374ed9a3aa 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 80354beb4d..f1561a927e 100644
+index 80354beb4..f1561a927 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 {
@@ -3095,7 +3095,7 @@ index 80354beb4d..f1561a927e 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 2a3997149a..9dfddd980b 100644
+index 2a3997149..9dfddd980 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 {
@@ -3107,7 +3107,7 @@ index 2a3997149a..9dfddd980b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 26262bbcb6..7fd5825b59 100644
+index 26262bbcb..7fd5825b5 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -6,6 +6,7 @@ public class EntityZombieHusk extends EntityZombie {
@@ -3119,7 +3119,7 @@ index 26262bbcb6..7fd5825b59 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 4d475d9633..f0ae05ea9d 100644
+index 4d475d963..f0ae05ea9 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
@@ -3131,7 +3131,7 @@ index 4d475d9633..f0ae05ea9d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java
-index 08aea9969d..c6e9b044f7 100644
+index 08aea9969..c6e9b044f 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 {
@@ -3151,7 +3151,7 @@ index 08aea9969d..c6e9b044f7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java
-index 5626f551b5..3c47d74dc4 100644
+index 5626f551b..3c47d74dc 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
@@ -3185,7 +3185,7 @@ index 5626f551b5..3c47d74dc4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBeg.java b/src/main/java/net/minecraft/server/PathfinderGoalBeg.java
-index d5935715f0..66216ea8ce 100644
+index d5935715f..66216ea8c 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 {
@@ -3204,7 +3204,7 @@ index d5935715f0..66216ea8ce 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java b/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java
-index b0559d3066..48db74c10b 100644
+index b0559d306..48db74c10 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
@@ -3224,7 +3224,7 @@ index b0559d3066..48db74c10b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java
-index 373db5c608..6c536cac05 100644
+index 373db5c60..6c536cac0 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 {
@@ -3244,7 +3244,7 @@ index 373db5c608..6c536cac05 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 0cc34400be..db7048e7a4 100644
+index 0cc34400b..db7048e7a 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 {
@@ -3268,7 +3268,7 @@ index 0cc34400be..db7048e7a4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java b/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java
-index 8707cb5afa..28b2aa2ce1 100644
+index 8707cb5af..28b2aa2ce 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 {
@@ -3280,7 +3280,7 @@ index 8707cb5afa..28b2aa2ce1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java
-index c834b99348..87b844a701 100644
+index c834b9934..87b844a70 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
@@ -3300,7 +3300,7 @@ index c834b99348..87b844a701 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalDefendVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalDefendVillage.java
-index 9a67f5b555..0b80e8d489 100644
+index 9a67f5b55..0b80e8d48 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 {
@@ -3312,7 +3312,7 @@ index 9a67f5b555..0b80e8d489 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 e4088249c0..d5d06c85db 100644
+index e4088249c..d5d06c85d 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 {
@@ -3332,7 +3332,7 @@ index e4088249c0..d5d06c85db 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java b/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java
-index 420ef53e4a..987b15ffea 100644
+index 420ef53e4..987b15ffe 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 {
@@ -3344,7 +3344,7 @@ index 420ef53e4a..987b15ffea 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java b/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java
-index e9679bb46f..ae9b5eee96 100644
+index e9679bb46..ae9b5eee9 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 {
@@ -3364,7 +3364,7 @@ index e9679bb46f..ae9b5eee96 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java b/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java
-index eb4d86f226..343b74c937 100644
+index eb4d86f22..343b74c93 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 {
@@ -3384,7 +3384,7 @@ index eb4d86f226..343b74c937 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java b/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java
-index b18f7c516a..ecb48fe459 100644
+index b18f7c516..ecb48fe45 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 {
@@ -3404,7 +3404,7 @@ index b18f7c516a..ecb48fe459 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java
-index 7fac14fb66..845cb071b7 100644
+index 7fac14fb6..845cb071b 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 {
@@ -3424,7 +3424,7 @@ index 7fac14fb66..845cb071b7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java
-index 1d19ffee9d..5fc43105b5 100644
+index 1d19ffee9..5fc43105b 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 {
@@ -3444,7 +3444,7 @@ index 1d19ffee9d..5fc43105b5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java
-index 896d2d56aa..55318e137a 100644
+index 896d2d56a..55318e137 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 {
@@ -3464,7 +3464,7 @@ index 896d2d56aa..55318e137a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java
-index 63b7777c08..78b3d63c13 100644
+index 63b7777c0..78b3d63c1 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 {
@@ -3484,7 +3484,7 @@ index 63b7777c08..78b3d63c13 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 1dcfa8ab47..32ef8cf5b1 100644
+index 1dcfa8ab4..32ef8cf5b 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 {
@@ -3504,7 +3504,7 @@ index 1dcfa8ab47..32ef8cf5b1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index f093744136..32176bbf2a 100644
+index f09374413..32176bbf2 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 {
@@ -3516,7 +3516,7 @@ index f093744136..32176bbf2a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java
-index c9a8ede5b2..ea774597f5 100644
+index c9a8ede5b..ea774597f 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 {
@@ -3528,7 +3528,7 @@ index c9a8ede5b2..ea774597f5 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 84d2cf8df6..856a796534 100644
+index 84d2cf8df..856a79653 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 {
@@ -3540,7 +3540,7 @@ index 84d2cf8df6..856a796534 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java
-index b89d161360..08767e28b4 100644
+index b89d16136..08767e28b 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 {
@@ -3560,7 +3560,7 @@ index b89d161360..08767e28b4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
-index 72df549eda..7291385d80 100644
+index 72df549ed..7291385d8 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 {
@@ -3580,7 +3580,7 @@ index 72df549eda..7291385d80 100644
              double d0 = this.a.h((Entity) this.a.eK());
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java
-index 614a8471da..a57752bd24 100644
+index 614a8471d..a57752bd2 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 {
@@ -3600,7 +3600,7 @@ index 614a8471da..a57752bd24 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java
-index a4894853f4..10d5f20cfd 100644
+index a4894853f..10d5f20cf 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
@@ -3612,7 +3612,7 @@ index a4894853f4..10d5f20cfd 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 702a75087c..6d49d8437d 100644
+index 702a75087..6d49d8437 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 {
@@ -3632,7 +3632,7 @@ index 702a75087c..6d49d8437d 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 9dc89d9953..1d59744274 100644
+index 9dc89d995..1d5974427 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 {
@@ -3652,7 +3652,7 @@ index 9dc89d9953..1d59744274 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java
-index 294ea66799..eb2da34571 100644
+index 294ea6679..eb2da3457 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 {
@@ -3672,7 +3672,7 @@ index 294ea66799..eb2da34571 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java
-index c38aedf623..32bd2e1ee1 100644
+index c38aedf62..32bd2e1ee 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 {
@@ -3692,7 +3692,7 @@ index c38aedf623..32bd2e1ee1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-index 53399e3115..d03130fcfd 100644
+index 53399e311..d03130fcf 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
@@ -3704,7 +3704,7 @@ index 53399e3115..d03130fcfd 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 579dc99df0..5dc3f7a2d1 100644
+index 579dc99df..5dc3f7a2d 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>
@@ -3716,7 +3716,7 @@ index 579dc99df0..5dc3f7a2d1 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java
-index 90eed77e18..87b9df53b0 100644
+index 90eed77e1..87b9df53b 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
@@ -3728,7 +3728,7 @@ index 90eed77e18..87b9df53b0 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 28b4b76ecd..37f2c06606 100644
+index 28b4b76ec..37f2c0660 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 {
@@ -3748,7 +3748,7 @@ index 28b4b76ecd..37f2c06606 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java
-index bf52ecc401..2bb7e0c1e8 100644
+index bf52ecc40..2bb7e0c1e 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 {
@@ -3768,7 +3768,7 @@ index bf52ecc401..2bb7e0c1e8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java b/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java
-index 59822905a5..f35318926b 100644
+index 59822905a..f35318926 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 {
@@ -3788,7 +3788,7 @@ index 59822905a5..f35318926b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java
-index 5b99b0ddd9..4724d1b8c1 100644
+index 5b99b0ddd..4724d1b8c 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 {
@@ -3800,7 +3800,7 @@ index 5b99b0ddd9..4724d1b8c1 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 eb99159c8f..14254931c3 100644
+index eb99159c8..14254931c 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 {
@@ -3812,7 +3812,7 @@ index eb99159c8f..14254931c3 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 f399683b74..33b616a601 100644
+index f399683b7..33b616a60 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 {
@@ -3832,7 +3832,7 @@ index f399683b74..33b616a601 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 9fc3524369..3cad98d721 100644
+index 9fc352436..3cad98d72 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 {
@@ -3844,7 +3844,7 @@ index 9fc3524369..3cad98d721 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 dd498a7070..91a96e6e22 100644
+index dd498a707..91a96e6e2 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 {
@@ -3862,7 +3862,7 @@ index dd498a7070..91a96e6e22 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java
-index 316205ebfa..8cc9f4fe13 100644
+index 316205ebf..8cc9f4fe1 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 {
@@ -3880,7 +3880,7 @@ index 316205ebfa..8cc9f4fe13 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java
-index e74b169484..6688219cf6 100644
+index e74b16948..6688219cf 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 {
@@ -3900,7 +3900,7 @@ index e74b169484..6688219cf6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java
-index f572f33673..218c35bf77 100644
+index f572f3367..218c35bf7 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
@@ -3918,7 +3918,7 @@ index f572f33673..218c35bf77 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index 31c4412012..ada48a7aa1 100644
+index 31c441201..ada48a7aa 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 {
@@ -3930,7 +3930,7 @@ index 31c4412012..ada48a7aa1 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 e964907b05..b8fa65560c 100644
+index e964907b0..b8fa65560 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 {
@@ -3942,7 +3942,7 @@ index e964907b05..b8fa65560c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSit.java b/src/main/java/net/minecraft/server/PathfinderGoalSit.java
-index 3bb38030cc..b766e7552e 100644
+index 3bb38030c..b766e7552 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 {
@@ -3960,7 +3960,7 @@ index 3bb38030cc..b766e7552e 100644
              return this.willSit && this.entity.getGoalTarget() == null; // CraftBukkit - Allow sitting for wild animals
          } else if (this.entity.av()) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java
-index 3a081935fa..9e0c58629c 100644
+index 3a081935f..9e0c58629 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 {
@@ -3972,7 +3972,7 @@ index 3a081935fa..9e0c58629c 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 04acbc8250..5a8fd74df2 100644
+index 04acbc825..5a8fd74df 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 {
@@ -3992,7 +3992,7 @@ index 04acbc8250..5a8fd74df2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java
-index 95afc8eeec..59a50e5499 100644
+index 95afc8eee..59a50e549 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 {
@@ -4004,7 +4004,7 @@ index 95afc8eeec..59a50e5499 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 0b036f29cf..c12a3e6a6f 100644
+index 0b036f29c..c12a3e6a6 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 {
@@ -4024,7 +4024,7 @@ index 0b036f29cf..c12a3e6a6f 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 9d37bd1a8a..0ead41f0dd 100644
+index 9d37bd1a8..0ead41f0d 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 {
@@ -4036,7 +4036,7 @@ index 9d37bd1a8a..0ead41f0dd 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 e6c5b968b1..c9f3680ba3 100644
+index e6c5b968b..c9f3680ba 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
@@ -4054,7 +4054,7 @@ index e6c5b968b1..c9f3680ba3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWater.java b/src/main/java/net/minecraft/server/PathfinderGoalWater.java
-index 65b6bcdbde..fbc36ff7ae 100644
+index 65b6bcdbd..fbc36ff7a 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 {
@@ -4066,7 +4066,7 @@ index 65b6bcdbde..fbc36ff7ae 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java b/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java
-index a2fc2cd802..8f064526b2 100644
+index a2fc2cd80..8f064526b 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 {
@@ -4086,7 +4086,7 @@ index a2fc2cd802..8f064526b2 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 1666412782..1fe54bb161 100644
+index 166641278..1fe54bb16 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -125,6 +125,11 @@ public class PurpurConfig {
@@ -4221,7 +4221,7 @@ index 1666412782..1fe54bb161 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 0000000000..99e184d36e
+index 000000000..99e184d36
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 @@ -0,0 +1,74 @@
@@ -4301,7 +4301,7 @@ index 0000000000..99e184d36e
 +}
 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 0000000000..d64a66274b
+index 000000000..d64a66274
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 @@ -0,0 +1,77 @@
@@ -4384,7 +4384,7 @@ index 0000000000..d64a66274b
 +}
 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 0000000000..b0b504c7dc
+index 000000000..b0b504c7d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 @@ -0,0 +1,62 @@
@@ -4452,7 +4452,7 @@ index 0000000000..b0b504c7dc
 +}
 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 0000000000..a353069b78
+index 000000000..a353069b7
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 @@ -0,0 +1,65 @@
@@ -4523,7 +4523,7 @@ index 0000000000..a353069b78
 +}
 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 0000000000..74ff48259c
+index 000000000..74ff48259
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 @@ -0,0 +1,42 @@
@@ -4570,7 +4570,7 @@ index 0000000000..74ff48259c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 98f62d7760..83eeab5c37 100644
+index 98f62d776..83eeab5c3 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 {
@@ -4590,7 +4590,7 @@ index 98f62d7760..83eeab5c37 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 56c233872b..b19970c883 100644
+index 56c233872..b19970c88 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 {
diff --git a/patches/server/0021-Bring-back-server-name.patch b/patches/server/0021-Bring-back-server-name.patch
index e2fd96271..120f82d90 100644
--- a/patches/server/0021-Bring-back-server-name.patch
+++ b/patches/server/0021-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From b49bc7d1290687f2543fb66caee5febd7f9c1285 Mon Sep 17 00:00:00 2001
+From d72e9dd07cc8f5ffe7b34d8fae1c86187c90b661 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index fb092a941..54c0b4247 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9eccb787f..3c24ea3fa 100644
+index 6a9786eb9..182235a92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2161,4 +2161,11 @@ public final class CraftServer implements Server {
+@@ -2163,4 +2163,11 @@ public final class CraftServer implements Server {
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
      }
      // Paper end
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
new file mode 100755
index 000000000..841855530
--- /dev/null
+++ b/scripts/upstreamCommit.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+(
+set -e
+PS1="$"
+
+function changelog() {
+    base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
+    cd $1 && git log --oneline ${base}...HEAD
+}
+paper=$(changelog Paper)
+
+updated=""
+logsuffix=""
+if [ ! -z "$paper" ]; then
+    logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
+    if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi
+fi
+disclaimer="Upstream has released updates that appears to apply and compile correctly"
+
+if [ ! -z "$1" ]; then
+    disclaimer="$@"
+fi
+
+log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
+
+echo -e "$log" | git commit -F -
+
+) || exit 1