Update upstream B/CB

Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch

@@ -1,11 +1,11 @@
-From 97a67535fcd794c822375c92418cf46eb118ab01 Mon Sep 17 00:00:00 2001
+From 1489de856ef53bf78de04ff8cfd68de7d17b344c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 32d00e274..a3c0d9159 100644
+index 098bd3fba..55d8e74f8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -73,4 +73,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 32d00e274..a3c0d9159 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 3f0e636b7..9f8f667c1 100644
+index 80a6ef416..af01286da 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -17,7 +17,7 @@ public class EntityZombie extends EntityMonster {
@@ -32,7 +32,7 @@ index 3f0e636b7..9f8f667c1 100644
      private static final DataWatcherObject<Boolean> bC = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Integer> bD = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.b);
      private static final DataWatcherObject<Boolean> bE = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
-@@ -127,9 +127,9 @@ public class EntityZombie extends EntityMonster {
+@@ -128,9 +128,9 @@ public class EntityZombie extends EntityMonster {
          if (this.world != null && !this.world.isClientSide) {
              AttributeInstance attributeinstance = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
  
@@ -45,5 +45,5 @@ index 3f0e636b7..9f8f667c1 100644
          }
  
 -- 
-2.18.0
+2.19.1
 

Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch

@@ -1,4 +1,4 @@
-From 60d9338b4bfe222121bb95d4df8955d906629b31 Mon Sep 17 00:00:00 2001
+From 653965bbc4a247fd0a288d53fdae56fe80318b26 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -47,7 +47,7 @@ index dd309030e..7cddfc380 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index a0e3b72c1..f6231f3e5 100644
+index 2485b0fb0..8781dea88 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -64,8 +64,18 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
@@ -72,10 +72,10 @@ index a0e3b72c1..f6231f3e5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 1ab3072cc..e5170bff5 100644
+index af01286da..173e14760 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -263,7 +263,7 @@ public class EntityZombie extends EntityMonster {
+@@ -268,7 +268,7 @@ public class EntityZombie extends EntityMonster {
                      int j1 = j + MathHelper.nextInt(this.random, 7, 40) * MathHelper.nextInt(this.random, -1, 1);
                      int k1 = k + MathHelper.nextInt(this.random, 7, 40) * MathHelper.nextInt(this.random, -1, 1);
  

Spigot-Server-Patches/0306-EntityTransformedEvent.patch

@@ -1,11 +1,11 @@
-From db6933607895a3d095e9699ebfa6ca114c43d273 Mon Sep 17 00:00:00 2001
+From a1a853328369baa51f52f6b5f052b9d18e6418ab Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 5b856aea2f..13a6ddac59 100644
+index 5b856aea2..13a6ddac5 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -43,7 +43,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -18,7 +18,7 @@ index 5b856aea2f..13a6ddac59 100644
  
                  for (int i = 0; i < 5; ++i) {
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index e37fca5b12..62bb51104d 100644
+index 70f54b1fb..c7d6aa238 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -623,7 +623,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -31,10 +31,10 @@ index e37fca5b12..62bb51104d 100644
              this.die();
          }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index e5170bff5b..04d25ad76a 100644
+index 173e14760..72b95078e 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -234,7 +234,7 @@ public class EntityZombie extends EntityMonster {
+@@ -239,7 +239,7 @@ public class EntityZombie extends EntityMonster {
                  entityzombie.setCustomName(this.getCustomName());
                  entityzombie.setCustomNameVisible(this.getCustomNameVisible());
              }
@@ -43,7 +43,7 @@ index e5170bff5b..04d25ad76a 100644
              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.DROWNED); // CraftBukkit - added spawn reason
              this.die();
          }
-@@ -393,6 +393,7 @@ public class EntityZombie extends EntityMonster {
+@@ -398,6 +398,7 @@ public class EntityZombie extends EntityMonster {
                  entityzombievillager.setCustomNameVisible(entityvillager.getCustomNameVisible());
              }
  
@@ -52,7 +52,7 @@ index e5170bff5b..04d25ad76a 100644
              this.world.a((EntityHuman) null, 1026, new BlockPosition(this), 0);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index bf136a6aa3..94bd3c5b37 100644
+index 4edad8bb6..39de69fa7 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -130,7 +130,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -65,5 +65,5 @@ index bf136a6aa3..94bd3c5b37 100644
          if (this.bD != null) {
              EntityHuman entityhuman = this.world.b(this.bD);
 -- 
-2.19.0
+2.19.1
 

Spigot-Server-Patches/0401-Use-EntityTypes-for-living-entities.patch

@@ -1,11 +1,11 @@
-From 5714958d604d901151f4be130994de76272fb091 Mon Sep 17 00:00:00 2001
+From 56a5c799a7e0c6f6e1bd6a0eeebd694509b73fe7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
-index 5a0cc6d058..d385f647e7 100644
+index 5a0cc6d05..d385f647e 100644
 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 @@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block {
@@ -18,7 +18,7 @@ index 5a0cc6d058..d385f647e7 100644
              entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
              world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
 diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
-index f7ea9f9b82..dfa3bd685c 100644
+index f7ea9f9b8..dfa3bd685 100644
 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 @@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@@ -40,7 +40,7 @@ index f7ea9f9b82..dfa3bd685c 100644
                  entityirongolem.setPlayerCreated(true);
                  entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index 924d15649a..9e9fa7d581 100644
+index 924d15649..9e9fa7d58 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block {
@@ -53,7 +53,7 @@ index 924d15649a..9e9fa7d581 100644
                          entityturtle.setAgeRaw(-24000);
                          entityturtle.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
-index 7904b12623..38fc40e502 100644
+index 7904b1262..38fc40e50 100644
 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
 @@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull {
@@ -66,7 +66,7 @@ index 7904b12623..38fc40e502 100644
  
                  entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index e083ea483a..56bd827e32 100644
+index e083ea483..56bd827e3 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -361,7 +361,7 @@ public class EnderDragonBattle {
@@ -79,7 +79,7 @@ index e083ea483a..56bd827e32 100644
          entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
          this.d.addEntity(entityenderdragon);
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index efb728d04d..3bfbf4752d 100644
+index efb728d04..3bfbf4752 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal {
@@ -92,7 +92,7 @@ index efb728d04d..3bfbf4752d 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index b2e50f8532..9c7bf12b88 100644
+index b2e50f853..9c7bf12b8 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal {
@@ -105,7 +105,7 @@ index b2e50f8532..9c7bf12b88 100644
  
      public float getHeadHeight() {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index c82b5f3aba..ba53e9b0ba 100644
+index c82b5f3ab..ba53e9b0b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
 @@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile {
@@ -118,7 +118,7 @@ index c82b5f3aba..ba53e9b0ba 100644
                              entityendermite.a(true);
                              entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 2d9631c5d5..16d94fe3f4 100644
+index 2d9631c5d..16d94fe3f 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -221,7 +221,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -131,7 +131,7 @@ index 2d9631c5d5..16d94fe3f4 100644
                  entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null);
                  entityvex.a(EntityEvoker.this);
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index 51a07311f7..f201963888 100644
+index 51a07311f..f20196388 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -205,10 +205,10 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -148,7 +148,7 @@ index 51a07311f7..f201963888 100644
              int i;
              if (j < 4) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 50c0a82777..627ba10383 100644
+index 50c0a8277..627ba1038 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 @@ -38,7 +38,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -161,7 +161,7 @@ index 50c0a82777..627ba10383 100644
          return (EntityAgeable)object;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index ba6c0e96a3..17850e8576 100644
+index ba6c0e96a..17850e857 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -174,7 +174,7 @@ index ba6c0e96a3..17850e8576 100644
  
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index 560eac4af1..4b928d2c78 100644
+index 560eac4af..4b928d2c7 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
 @@ -40,7 +40,7 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -187,7 +187,7 @@ index 560eac4af1..4b928d2c78 100644
  
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 774e4d6414..0cf53b69f5 100644
+index 774e4d641..0cf53b69f 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -272,7 +272,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -200,7 +200,7 @@ index 774e4d6414..0cf53b69f5 100644
          EntityLlama entityllama2 = (EntityLlama)entityageable;
          int i = this.random.nextInt(Math.max(this.getStrength(), entityllama2.getStrength())) + 1;
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 13a6ddac59..d02455b39e 100644
+index 13a6ddac5..d02455b39 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -35,7 +35,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -222,7 +222,7 @@ index 13a6ddac59..d02455b39e 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index d2e25f04b7..90a7e00a05 100644
+index d2e25f04b..90a7e00a0 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -244,7 +244,7 @@ index d2e25f04b7..90a7e00a05 100644
                  entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                  entityocelot.setAgeRaw(-24000);
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index b405e63e81..b0802e12d9 100644
+index b405e63e8..b0802e12d 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -150,7 +150,7 @@ public class EntityPig extends EntityAnimal {
@@ -266,7 +266,7 @@ index b405e63e81..b0802e12d9 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index b9124a5b0d..cb3e45f14f 100644
+index b9124a5b0..cb3e45f14 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -15,7 +15,7 @@ public class EntityPolarBear extends EntityAnimal {
@@ -279,7 +279,7 @@ index b9124a5b0d..cb3e45f14f 100644
  
      public boolean f(ItemStack var1) {
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index b8ca530034..747409af02 100644
+index b8ca53003..747409af0 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -292,7 +292,7 @@ index b8ca530034..747409af02 100644
  
          if (this.random.nextInt(20) != 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index 4a9a9f9da0..db4c3aa604 100644
+index 4a9a9f9da..db4c3aa60 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -264,7 +264,7 @@ public class EntitySheep extends EntityAnimal {
@@ -305,7 +305,7 @@ index 4a9a9f9da0..db4c3aa604 100644
          entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
          return entitysheep1;
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index 761c94bdf3..ffbd572ddb 100644
+index 761c94bdf..ffbd572dd 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster {
@@ -318,7 +318,7 @@ index 761c94bdf3..ffbd572ddb 100644
              entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
              entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 2c1db9b782..0d88314de3 100644
+index 2c1db9b78..0d88314de 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -331,7 +331,7 @@ index 2c1db9b782..0d88314de3 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 6b6fbfd79b..29d5ef4c1c 100644
+index 6b6fbfd79..29d5ef4c1 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -269,6 +269,7 @@ public class EntityTypes<T extends Entity> {
@@ -343,7 +343,7 @@ index 6b6fbfd79b..29d5ef4c1c 100644
      public T a(World world) {
          return this.aT.apply(world); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index c7d6aa238d..5435d39809 100644
+index c7d6aa238..5435d3980 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -596,7 +596,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -365,7 +365,7 @@ index c7d6aa238d..5435d39809 100644
              // Paper start
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index af9aef76f8..68db6af622 100644
+index af9aef76f..68db6af62 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -343,7 +343,7 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -378,10 +378,10 @@ index af9aef76f8..68db6af622 100644
  
          if (uuid != null) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 04d25ad76a..c6413ef2a9 100644
+index 72b95078e..81b15b5b1 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -209,7 +209,7 @@ public class EntityZombie extends EntityMonster {
+@@ -214,7 +214,7 @@ public class EntityZombie extends EntityMonster {
      }
  
      protected void dE() {
@@ -390,7 +390,7 @@ index 04d25ad76a..c6413ef2a9 100644
          this.world.a((EntityHuman) null, 1040, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
      }
  
-@@ -256,7 +256,7 @@ public class EntityZombie extends EntityMonster {
+@@ -261,7 +261,7 @@ public class EntityZombie extends EntityMonster {
                  int i = MathHelper.floor(this.locX);
                  int j = MathHelper.floor(this.locY);
                  int k = MathHelper.floor(this.locZ);
@@ -399,7 +399,7 @@ index 04d25ad76a..c6413ef2a9 100644
  
                  for (int l = 0; l < 50; ++l) {
                      int i1 = i + MathHelper.nextInt(this.random, 7, 40) * MathHelper.nextInt(this.random, -1, 1);
-@@ -380,7 +380,7 @@ public class EntityZombie extends EntityMonster {
+@@ -385,7 +385,7 @@ public class EntityZombie extends EntityMonster {
              }
  
              EntityVillager entityvillager = (EntityVillager) entityliving;
@@ -408,7 +408,7 @@ index 04d25ad76a..c6413ef2a9 100644
  
              entityzombievillager.u(entityvillager);
              this.world.kill(entityvillager);
-@@ -439,7 +439,7 @@ public class EntityZombie extends EntityMonster {
+@@ -444,7 +444,7 @@ public class EntityZombie extends EntityMonster {
                          this.startRiding(entitychicken);
                      }
                  } else if ((double) this.world.random.nextFloat() < 0.05D) {
@@ -418,7 +418,7 @@ index 04d25ad76a..c6413ef2a9 100644
                      entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                      entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 85d402965b..0cca7b6d51 100644
+index 85d402965..0cca7b6d5 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie {
@@ -431,7 +431,7 @@ index 85d402965b..0cca7b6d51 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index c1f8984a0f..786ab0b290 100644
+index 39de69fa7..7c37d5c86 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -114,7 +114,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -444,7 +444,7 @@ index c1f8984a0f..786ab0b290 100644
          entityvillager.u(this);
          entityvillager.setProfession(this.getProfession());
 diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
-index 9e40781488..a4fab5c23a 100644
+index 9e4078148..a4fab5c23 100644
 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java
 +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
 @@ -34,7 +34,7 @@ public class ItemArmorStand extends Item {
@@ -457,7 +457,7 @@ index 9e40781488..a4fab5c23a 100644
  
                          entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 413188e970..476b840ae8 100644
+index 413188e97..476b840ae 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -59,7 +59,7 @@ public class MobSpawnerPhantom {
@@ -470,7 +470,7 @@ index 413188e970..476b840ae8 100644
                                                  entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
                                                  groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index d4fdcbdfd6..887e4461f3 100644
+index d4fdcbdfd..887e4461f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -492,7 +492,7 @@ index d4fdcbdfd6..887e4461f3 100644
          entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
          entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ);
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 560edb523f..f9b58b9729 100644
+index 560edb523..f9b58b972 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -134,7 +134,7 @@ public class VillageSiege {
@@ -505,7 +505,7 @@ index 560edb523f..f9b58b9729 100644
              } catch (Exception exception) {
                  exception.printStackTrace();
 diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
-index d53911594d..83f55adbad 100644
+index d53911594..83f55adba 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 @@ -174,7 +174,7 @@ public class WorldGenEndCityPieces {
@@ -527,7 +527,7 @@ index d53911594d..83f55adbad 100644
                  entityshulker.g(blockposition);
                  generatoraccess.addEntity(entityshulker);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
-index 50fe0e16b3..ceb37aab4e 100644
+index 50fe0e16b..ceb37aab4 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 @@ -146,7 +146,7 @@ public class WorldGenFeatureOceanRuinPieces {
@@ -540,7 +540,7 @@ index 50fe0e16b3..ceb37aab4e 100644
                  entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F);
                  entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null);
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
-index 6ab249ee7f..c9a17e3326 100644
+index 6ab249ee7..c9a17e332 100644
 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 @@ -37,7 +37,7 @@ public class WorldGenMonumentPieces {
@@ -580,7 +580,7 @@ index 6ab249ee7f..c9a17e3326 100644
              for(WorldGenMonumentPieces.WorldGenMonumentStateTracker worldgenmonumentpieces$worldgenmonumentstatetracker4 : aworldgenmonumentpieces$worldgenmonumentstatetracker) {
                  if (worldgenmonumentpieces$worldgenmonumentstatetracker4 != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
-index e327e2a283..c63b535ee0 100644
+index e327e2a28..c63b535ee 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 @@ -1656,7 +1656,7 @@ public class WorldGenVillagePieces {
@@ -602,7 +602,7 @@ index e327e2a283..c63b535ee0 100644
                          entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
                          entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
 diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
-index a05e0657bc..7062b0cec2 100644
+index a05e0657b..7062b0cec 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 @@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
@@ -615,7 +615,7 @@ index a05e0657bc..7062b0cec2 100644
                      entitywitch.di();
                      entitywitch.setPositionRotation((double) i + 0.5D, (double) j, (double) k + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
-index ee401980fe..9ca9306d09 100644
+index ee401980f..9ca9306d0 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 @@ -197,7 +197,7 @@ public class WorldGenWoodlandMansionPieces {
@@ -686,7 +686,7 @@ index ee401980fe..9ca9306d09 100644
                  entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
                  entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity)null, (NBTTagCompound)null);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 818e4c376d..4f9029c33a 100644
+index 818e4c376..4f9029c33 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -511,7 +511,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -699,7 +699,7 @@ index 818e4c376d..4f9029c33a 100644
                              entityhorseskeleton.s(true);
                              entityhorseskeleton.setAgeRaw(0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 10fa122536..bd118f7f0c 100644
+index 10fa12253..bd118f7f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1172,153 +1172,153 @@ public class CraftWorld implements World {

work/Bukkit

@@ -1 +1 @@
-Subproject commit 6924311be9ef8df636449a563a47ee46dfa1b71a
+Subproject commit 1627782b1c341cc9928c13bc7729fd53e6fee449

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit e693496c17562b3e865b545f755562bcad81f2e8
+Subproject commit ca22de36ab1164f67e5b36c994c62eb0411db056