Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
d94d6a29 Optimise IEntityAccess#getPlayerByUUID (#2842)
4237539e Guard against serializing mismatching chunk coordinate (#2844)
c1f57657 Updated Upstream (CraftBukkit)
f5569fd3 Fix SkullMeta.setPlayerProfile() (#2833)
2f527126 Update upstream CB
4151617d Update no chunk loads for hoppers and double chests patch (#2777)
d224bc03 [CI-SKIP] Passage outdated (#2776)
db3af11c Fix race condition with regionfile being closed right after getting one (#2812)
a817508f [CI-SKIP] Update dependency version in README.md (#2817)
9aeba7c9 Prevent bees loading chunks checking hive position (#2828)

current-paper

@@ -1 +1 @@
-1.15.1--49a178c15b7a90b64ef2eb353f5933bfb6b0530e
+1.15.1--4725c8bd69230be8a3e2ecfec2ecb3b38dd7f1a0

patches/server/0010-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From 9bb3f884200ceea42b3044d6ccabe253b4baea30 Mon Sep 17 00:00:00 2001
+From 4d5c94e0ea52dc2263cb38f10d14bbebae9c84e3 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
@@ -94,7 +94,7 @@ Subject: [PATCH] Integrate ridables
  create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 
 diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
-index 1d9ba04da..2bade947e 100644
+index 1d9ba04daa..2bade947ee 100644
 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 @@ -1,6 +1,6 @@
@@ -115,7 +115,7 @@ index 1d9ba04da..2bade947e 100644
              this.d = false;
              this.a.aK = this.a(this.a.aK, 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 647fc4b0e..c40d3b56b 100644
+index 647fc4b0e2..c40d3b56b1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -197,7 +197,7 @@ index 647fc4b0e..c40d3b56b 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index 3d27f0964..822316a65 100644
+index 3d27f0964a..822316a65f 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -86,7 +86,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -210,7 +210,7 @@ index 3d27f0964..822316a65 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 34239160b..b19028fa8 100644
+index 34239160be..b19028fa87 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -14,6 +14,11 @@ public class EntityBat extends EntityAmbient {
@@ -255,7 +255,7 @@ index 34239160b..b19028fa8 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index fb1c0a965..50b353582 100644
+index 829aab7f77..0071e18695 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -1,6 +1,7 @@
@@ -296,7 +296,7 @@ index fb1c0a965..50b353582 100644
          this.goalSelector.a(0, new EntityBee.b(this, 1.399999976158142D, true));
          this.goalSelector.a(1, new EntityBee.d());
          this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
-@@ -624,12 +637,12 @@ public class EntityBee extends EntityAnimal implements EntityBird {
+@@ -625,12 +638,12 @@ public class EntityBee extends EntityAnimal implements EntityBird {
  
          @Override
          public boolean a() {
@@ -311,7 +311,7 @@ index fb1c0a965..50b353582 100644
          }
      }
  
-@@ -1219,4 +1232,72 @@ public class EntityBee extends EntityAnimal implements EntityBird {
+@@ -1220,4 +1233,72 @@ public class EntityBee extends EntityAnimal implements EntityBird {
  
          }
      }
@@ -385,7 +385,7 @@ index fb1c0a965..50b353582 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
-index 5b1d2c7f5..d46b99b5c 100644
+index 5b1d2c7f50..d46b99b5c9 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 {
@@ -430,7 +430,7 @@ index 5b1d2c7f5..d46b99b5c 100644
          if (this.c <= 0) {
              this.c = 100;
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index 57af3835e..7219f9032 100644
+index 57af3835ee..7219f90322 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 {
@@ -504,7 +504,7 @@ index 57af3835e..7219f9032 100644
  
          private final EntityCat a;
 diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
-index 23ced2c7b..661358358 100644
+index 23ced2c7bb..6613583587 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 {
@@ -516,7 +516,7 @@ index 23ced2c7b..661358358 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index 65795fc89..b31b60604 100644
+index 65795fc896..b31b606044 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 {
@@ -545,7 +545,7 @@ index 65795fc89..b31b60604 100644
              this.forceDrops = true; // CraftBukkit
              this.a((IMaterial) Items.EGG);
 diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java
-index 1e3782122..c0b066d18 100644
+index 1e3782122a..c0b066d188 100644
 --- a/src/main/java/net/minecraft/server/EntityCod.java
 +++ b/src/main/java/net/minecraft/server/EntityCod.java
 @@ -4,6 +4,7 @@ public class EntityCod extends EntityFishSchool {
@@ -557,7 +557,7 @@ index 1e3782122..c0b066d18 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index e1d0f0f38..dcff77d8d 100644
+index e1d0f0f38d..dcff77d8d8 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -9,11 +9,13 @@ public class EntityCow extends EntityAnimal {
@@ -575,7 +575,7 @@ index e1d0f0f38..dcff77d8d 100644
          this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
          if (net.pl3x.purpur.PurpurConfig.feedMushroomsToCows > 0) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem(), Blocks.BROWN_MUSHROOM.getItem()), false)); else // Purpur
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 77ba92333..ebae46280 100644
+index 77ba923338..ebae462807 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -21,12 +21,14 @@ public class EntityCreeper extends EntityMonster {
@@ -654,7 +654,7 @@ index 77ba92333..ebae46280 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
-index 3523007ae..96d090e34 100644
+index ce78586ea0..47c310bd5a 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 {
@@ -715,7 +715,7 @@ index 3523007ae..96d090e34 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 77885f67f..b9a5ab443 100644
+index 77885f67ff..b9a5ab4430 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 {
@@ -754,7 +754,7 @@ index 77885f67f..b9a5ab443 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 9acdd6e56..5935ecb52 100644
+index 9acdd6e566..5935ecb529 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -49,6 +49,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -766,7 +766,7 @@ index 9acdd6e56..5935ecb52 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 8741df83b..560ff3227 100644
+index 8741df83b5..560ff3227f 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -23,6 +23,7 @@ public class EntityEnderman extends EntityMonster {
@@ -786,7 +786,7 @@ index 8741df83b..560ff3227 100644
          this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, 1.0D, false));
          this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D, 0.0F));
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index b34695f2d..92288e704 100644
+index b34695f2d0..92288e704f 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -9,17 +9,19 @@ public class EntityEndermite extends EntityMonster {
@@ -811,7 +811,7 @@ index b34695f2d..92288e704 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 886268b09..3560c9529 100644
+index 886268b09e..3560c95298 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 {
@@ -840,7 +840,7 @@ index 886268b09..3560c9529 100644
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index d332907b3..0ca3d45c9 100644
+index d332907b3b..0ca3d45c9c 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -72,13 +72,10 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -898,7 +898,7 @@ index d332907b3..0ca3d45c9 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 45b4db990..e34ca7170 100644
+index bd62ac3ed8..2156c86be8 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 {
@@ -1048,7 +1048,7 @@ index 45b4db990..e34ca7170 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
-index e1c2540d1..562dd6500 100644
+index e1c2540d14..562dd6500e 100644
 --- a/src/main/java/net/minecraft/server/EntityGhast.java
 +++ b/src/main/java/net/minecraft/server/EntityGhast.java
 @@ -10,12 +10,15 @@ public class EntityGhast extends EntityFlying implements IMonster {
@@ -1086,7 +1086,7 @@ index e1c2540d1..562dd6500 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 bcbade19e..b7e2022b1 100644
+index bcbade19ea..b7e2022b19 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -5,7 +5,9 @@ public class EntityGiantZombie extends EntityMonster {
@@ -1100,7 +1100,7 @@ index bcbade19e..b7e2022b1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
-index e69cb334f..aed6ee845 100644
+index e69cb334fb..aed6ee845a 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardian.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardian.java
 @@ -24,8 +24,15 @@ public class EntityGuardian extends EntityMonster {
@@ -1175,7 +1175,7 @@ index e69cb334f..aed6ee845 100644
                  Vec3D vec3d = new Vec3D(this.b - this.i.locX(), this.c - this.i.locY(), this.d - this.i.locZ());
                  double d0 = vec3d.f();
 diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java
-index 7484bfeea..292125cbd 100644
+index 7484bfeea0..292125cbd2 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 {
@@ -1187,7 +1187,7 @@ index 7484bfeea..292125cbd 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 9e708769f..5cd46c747 100644
+index 9e708769f7..5cd46c7475 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
@@ -1202,7 +1202,7 @@ index 9e708769f..5cd46c747 100644
          this.loadChest();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 290cb9337..52ea911fe 100644
+index 290cb9337c..52ea911fe9 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -179,4 +179,10 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -1217,7 +1217,7 @@ index 290cb9337..52ea911fe 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index 5782a25ec..dbe022340 100644
+index 5782a25ecd..dbe0223401 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
 @@ -79,4 +79,10 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -1232,7 +1232,7 @@ index 5782a25ec..dbe022340 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3c0621e65..e9d1c01ed 100644
+index 003df00b44..57c528d532 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1259,7 +1259,7 @@ index 3c0621e65..e9d1c01ed 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 81b7cd06f..18fedbc69 100644
+index 81b7cd06f2..18fedbc691 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
@@ -1279,7 +1279,7 @@ index 81b7cd06f..18fedbc69 100644
          this.goalSelector.a(4, new EntityIllagerIllusioner.b());
          this.goalSelector.a(5, new EntityIllagerIllusioner.a());
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 5fb3c948d..917e5ac64 100644
+index 5fb3c948d9..917e5ac64c 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;
@@ -1374,7 +1374,7 @@ index 5fb3c948d..917e5ac64 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 2f764776b..63b88f454 100644
+index 2f764776b2..63b88f454b 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -14,11 +14,13 @@ public class EntityIronGolem extends EntityGolem {
@@ -1408,7 +1408,7 @@ index 2f764776b..63b88f454 100644
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0d5236bd7..969a77c59 100644
+index 0d5236bd7e..969a77c597 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -91,10 +91,10 @@ public abstract class EntityLiving extends Entity {
@@ -1478,7 +1478,7 @@ index 0d5236bd7..969a77c59 100644
          this.bB = f;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 6d4d41c88..6ebb6fd66 100644
+index 6d4d41c88c..6ebb6fd663 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -16,6 +16,29 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -1552,7 +1552,7 @@ index 6d4d41c88..6ebb6fd66 100644
  
          return i == -1 ? null : EnumColor.fromColorIndex(i);
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
-index 4cebd67e8..f8129ef10 100644
+index 4cebd67e85..f8129ef10d 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
 @@ -9,6 +9,7 @@ public class EntityLlamaTrader extends EntityLlama {
@@ -1578,7 +1578,7 @@ index 4cebd67e8..f8129ef10 100644
      @Override
      public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java
-index 1fdc248ba..b5e8857cb 100644
+index 1fdc248ba8..b5e8857cbb 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 {
@@ -1599,7 +1599,7 @@ index 1fdc248ba..b5e8857cb 100644
  
          this.setMot(vec3d.x, (double) (this.dp() + (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 ce5bac35d..80c98c04b 100644
+index ce5bac35db..80c98c04b1 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 {
@@ -1611,7 +1611,7 @@ index ce5bac35d..80c98c04b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index d9a7b8ac1..8093e0150 100644
+index d9a7b8ac1e..8093e01505 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -13,6 +13,7 @@ public class EntityOcelot extends EntityAnimal {
@@ -1631,7 +1631,7 @@ index d9a7b8ac1..8093e0150 100644
          this.goalSelector.a(7, new PathfinderGoalLeapAtTarget(this, 0.3F));
          this.goalSelector.a(8, new PathfinderGoalOcelotAttack(this));
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index cd41c80f1..c6afe108c 100644
+index cd41c80f19..c6afe108c7 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -39,6 +39,7 @@ public class EntityPanda extends EntityAnimal {
@@ -1738,7 +1738,7 @@ index cd41c80f1..c6afe108c 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 140208761..976b3c127 100644
+index 1402087612..976b3c1273 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 {
@@ -1810,7 +1810,7 @@ index 140208761..976b3c127 100644
          this.goalSelector.a(2, this.goalSit);
          this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true));
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 052a741c0..ccc1ade4e 100644
+index 052a741c0b..ccc1ade4e4 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -1928,7 +1928,7 @@ index 052a741c0..ccc1ade4e 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 8d277566e..f71d4b58f 100644
+index 8d277566e9..f71d4b58f0 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -17,11 +17,13 @@ public class EntityPig extends EntityAnimal {
@@ -1985,7 +1985,7 @@ index 8d277566e..f71d4b58f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 9dd028b55..8d57c5f1b 100644
+index 9dd028b558..8d57c5f1b5 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 {
@@ -2009,7 +2009,7 @@ index 9dd028b55..8d57c5f1b 100644
      protected void a(DifficultyDamageScaler difficultydamagescaler) {
          this.setSlot(EnumItemSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
 diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
-index 0357c9da9..e4762bf98 100644
+index 0357c9da93..e4762bf98d 100644
 --- a/src/main/java/net/minecraft/server/EntityPillager.java
 +++ b/src/main/java/net/minecraft/server/EntityPillager.java
 @@ -11,12 +11,14 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow,
@@ -2028,7 +2028,7 @@ index 0357c9da9..e4762bf98 100644
          this.goalSelector.a(3, new PathfinderGoalCrossbowAttack<>(this, 1.0D, 8.0F));
          this.goalSelector.a(8, new PathfinderGoalRandomStroll(this, 0.6D));
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index f8e29a02d..b1652477e 100644
+index f8e29a02d3..b1652477e8 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 {
@@ -2098,7 +2098,7 @@ index f8e29a02d..b1652477e 100644
  
          public d() {
 diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
-index 98af9a223..36d88e9ce 100644
+index 98af9a2235..36d88e9ce5 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 {
@@ -2119,7 +2119,7 @@ index 98af9a223..36d88e9ce 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 2ed2d0b6b..d36a074c8 100644
+index 2ed2d0b6bb..d36a074c89 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 {
@@ -2150,7 +2150,7 @@ index 2ed2d0b6b..d36a074c8 100644
          double d0 = this.moveController.c();
  
 diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
-index fd25ce102..5fa0b505b 100644
+index fd25ce1026..5fa0b505b9 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 {
@@ -2170,7 +2170,7 @@ index fd25ce102..5fa0b505b 100644
          this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 0.4D));
          this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
 diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java
-index 6be29f307..7347ffcd5 100644
+index 6be29f3078..7347ffcd5c 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 {
@@ -2182,7 +2182,7 @@ index 6be29f307..7347ffcd5 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index e3419a7f4..a065ddb90 100644
+index e3419a7f47..a065ddb907 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;
@@ -2221,7 +2221,7 @@ index e3419a7f4..a065ddb90 100644
          this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
          this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false));
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index 0d2ceff6f..d687a53a6 100644
+index 0d2ceff6f2..d687a53a6f 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 {
@@ -2241,7 +2241,7 @@ index 0d2ceff6f..d687a53a6 100644
          this.goalSelector.a(4, new EntityShulker.a());
          this.goalSelector.a(7, new EntityShulker.e());
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 08c2a22f7..021bce7e9 100644
+index 08c2a22f7a..021bce7e95 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -9,12 +9,14 @@ public class EntitySilverfish extends EntityMonster {
@@ -2260,7 +2260,7 @@ index 08c2a22f7..021bce7e9 100644
          this.goalSelector.a(4, new PathfinderGoalMeleeAttack(this, 1.0D, false));
          this.goalSelector.a(5, new EntitySilverfish.PathfinderGoalSilverfishHideInBlock(this));
 diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
-index 0e78d5c62..908e51b63 100644
+index 0e78d5c62c..908e51b636 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
 @@ -4,6 +4,7 @@ public class EntitySkeleton extends EntitySkeletonAbstract {
@@ -2272,7 +2272,7 @@ index 0e78d5c62..908e51b63 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index fdeb8980d..347766e4b 100644
+index fdeb8980d9..347766e4b0 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -28,6 +28,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -2284,7 +2284,7 @@ index fdeb8980d..347766e4b 100644
          this.goalSelector.a(3, new PathfinderGoalFleeSun(this, 1.0D));
          this.goalSelector.a(3, new PathfinderGoalAvoidTarget<>(this, EntityWolf.class, 6.0F, 1.0D, 1.2D));
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
-index 2eb53864f..eda880703 100644
+index 2eb53864f2..eda880703e 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 {
@@ -2296,7 +2296,7 @@ index 2eb53864f..eda880703 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 98e042424..c2b93010a 100644
+index 98e042424c..c2b93010a3 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 {
@@ -2308,7 +2308,7 @@ index 98e042424..c2b93010a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 2efc18df9..71e8e95d2 100644
+index 2efc18df94..71e8e95d25 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -29,11 +29,13 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -2335,7 +2335,7 @@ index 2efc18df9..71e8e95d2 100644
  
          this.setMot(vec3d.x, (double) this.dp(), vec3d.z);
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 53c5057d2..9d9998820 100644
+index 53c5057d20..9d99988206 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -13,10 +13,12 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -2369,7 +2369,7 @@ index 53c5057d2..9d9998820 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index d02db5659..c38ae96f2 100644
+index d02db56595..c38ae96f23 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -9,11 +9,13 @@ public class EntitySpider extends EntityMonster {
@@ -2387,7 +2387,7 @@ index d02db5659..c38ae96f2 100644
          this.goalSelector.a(4, new EntitySpider.PathfinderGoalSpiderMeleeAttack(this));
          this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 0.8D));
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 92efe4e7f..eb74f5d12 100644
+index 92efe4e7f5..eb74f5d127 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -21,14 +21,16 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -2476,7 +2476,7 @@ index 92efe4e7f..eb74f5d12 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
-index 9b2eea71c..4ac12ebe2 100644
+index 9b2eea71cc..4ac12ebe2c 100644
 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 @@ -110,6 +110,12 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -2493,7 +2493,7 @@ index 9b2eea71c..4ac12ebe2 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 ef8f373be..b00ae70cb 100644
+index ef8f373bea..b00ae70cb3 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 {
@@ -2505,7 +2505,7 @@ index ef8f373be..b00ae70cb 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index dd02cb348..f18261197 100644
+index dd02cb3485..f18261197c 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 {
@@ -2632,7 +2632,7 @@ index dd02cb348..f18261197 100644
              if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) {
                  double d0 = this.b - this.i.locX();
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index dcba6d6c8..b82d53e5d 100644
+index dcba6d6c89..b82d53e5da 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -267,6 +267,10 @@ public class EntityTypes<T extends Entity> {
@@ -2647,7 +2647,7 @@ index dcba6d6c8..b82d53e5d 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 cf274666c..3ea0b4759 100644
+index cf274666c7..3ea0b47593 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 {
@@ -2692,7 +2692,7 @@ index cf274666c..3ea0b4759 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 c974c02e9..e8f76209d 100644
+index c974c02e92..e8f76209d7 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -15,12 +15,14 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -2711,7 +2711,7 @@ index c974c02e9..e8f76209d 100644
          this.goalSelector.a(2, new EntityIllagerAbstract.b(this));
          this.goalSelector.a(3, new EntityRaider.a(this, 10.0F));
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 7b6b1ad17..9ef1b9e61 100644
+index 7b6b1ad17b..9ef1b9e61c 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 {
@@ -2735,7 +2735,7 @@ index 7b6b1ad17..9ef1b9e61 100644
          this.goalSelector.a(2, new PathfinderGoalRandomStrollLand(this, 1.0D));
          this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 8977c3516..3e6c4eff5 100644
+index 8977c3516b..3e6c4eff5d 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 {
@@ -2757,7 +2757,7 @@ index 8977c3516..3e6c4eff5 100644
          this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D));
          this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index db15d5e0a..2a6e1f33b 100644
+index db15d5e0a2..2a6e1f33b7 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -27,6 +27,7 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -2792,7 +2792,7 @@ index db15d5e0a..2a6e1f33b 100644
  
          private final EntityWolf j;
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 7d882d9c7..8f9d252c1 100644
+index 7d882d9c7e..8f9d252c1e 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -37,6 +37,7 @@ public class EntityZombie extends EntityMonster {
@@ -2812,7 +2812,7 @@ index 7d882d9c7..8f9d252c1 100644
          this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index da8446d05..350aaaeb0 100644
+index da8446d05d..350aaaeb0d 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 {
@@ -2824,7 +2824,7 @@ index da8446d05..350aaaeb0 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 8082fa617..0c51c8dea 100644
+index 8082fa617a..0c51c8dea1 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -22,6 +22,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -2845,7 +2845,7 @@ index 8082fa617..0c51c8dea 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
-index 0c7f094e5..212af252b 100644
+index 0c7f094e54..212af252be 100644
 --- a/src/main/java/net/minecraft/server/Vec3D.java
 +++ b/src/main/java/net/minecraft/server/Vec3D.java
 @@ -89,6 +89,7 @@ public class Vec3D implements IPosition {
@@ -2857,7 +2857,7 @@ index 0c7f094e5..212af252b 100644
          return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 960361ff7..c4955fae6 100644
+index 960361ff74..c4955fae62 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -131,6 +131,11 @@ public class PurpurConfig {
@@ -2998,7 +2998,7 @@ index 960361ff7..c4955fae6 100644
  }
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 new file mode 100644
-index 000000000..7c79e23d3
+index 0000000000..7c79e23d34
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 @@ -0,0 +1,75 @@
@@ -3079,7 +3079,7 @@ index 000000000..7c79e23d3
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 new file mode 100644
-index 000000000..d64a66274
+index 0000000000..d64a66274b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 @@ -0,0 +1,77 @@
@@ -3162,7 +3162,7 @@ index 000000000..d64a66274
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 new file mode 100644
-index 000000000..dc43fef37
+index 0000000000..dc43fef37d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 @@ -0,0 +1,62 @@
@@ -3230,7 +3230,7 @@ index 000000000..dc43fef37
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 new file mode 100644
-index 000000000..f8b3310b8
+index 0000000000..f8b3310b84
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 @@ -0,0 +1,65 @@
@@ -3301,7 +3301,7 @@ index 000000000..f8b3310b8
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 new file mode 100644
-index 000000000..74ff48259
+index 0000000000..74ff48259c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 @@ -0,0 +1,42 @@
@@ -3349,7 +3349,7 @@ index 000000000..74ff48259
 +}
 diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 new file mode 100644
-index 000000000..e3a9fd9d2
+index 0000000000..e3a9fd9d21
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 @@ -0,0 +1,20 @@
@@ -3374,7 +3374,7 @@ index 000000000..e3a9fd9d2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 33f56b85e..ffd137228 100644
+index 33f56b85ea..ffd1372284 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -723,5 +723,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -3394,7 +3394,7 @@ index 33f56b85e..ffd137228 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 56c233872..b19970c88 100644
+index 56c233872b..b19970c883 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -75,4 +75,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@@ -3415,5 +3415,5 @@ index 56c233872..b19970c88 100644
 +    // Purpur end
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0034-Add-chance-for-zombie-horse-natural-spawns.patch

@@ -1,4 +1,4 @@
-From 261892e5199193eed4f87e8c0c2411a7d0698d1e Mon Sep 17 00:00:00 2001
+From 3aaa5a6281ff8a911e3f6623bfc8dba4e2990ef1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -9,10 +9,10 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
  2 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 70cbff313..0a9df816c 100644
+index 8526a3fda1..a299fbf96a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -540,12 +540,18 @@ public class WorldServer extends World {
+@@ -549,12 +549,18 @@ public class WorldServer extends World {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {
@@ -38,7 +38,7 @@ index 70cbff313..0a9df816c 100644
  
                  this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 511429677..3389d626a 100644
+index 5114296777..3389d626af 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -207,6 +207,11 @@ public class PurpurConfig {

patches/server/0050-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From a812fd3b8c0aef3ba27d7a49f4b721ee73d9db5a Mon Sep 17 00:00:00 2001
+From 3a01733c19a4960d0e0ff4e512234666fd0aae84 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -105,7 +105,7 @@ index 8565ad9c76..50a922ff1b 100644
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 8b36252ae1..5e2d56d5de 100644
+index 818243351e..69f4fedd01 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -116,28 +116,18 @@ public interface IEntityAccess {
@@ -205,10 +205,10 @@ index a4af019bc6..2db59c55ca 100644
                                  if (from.getX() != Double.MAX_VALUE) {
                                      Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0a9df816c2..84c0693303 100644
+index a299fbf96a..bc02c54526 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -367,7 +367,7 @@ public class WorldServer extends World {
+@@ -376,7 +376,7 @@ public class WorldServer extends World {
          }
  
          if (this.C && this.players.stream().noneMatch((entityplayer) -> {
@@ -217,7 +217,7 @@ index 0a9df816c2..84c0693303 100644
          })) {
              // CraftBukkit start
              long l = this.worldData.getDayTime() + 24000L;
-@@ -648,7 +648,7 @@ public class WorldServer extends World {
+@@ -657,7 +657,7 @@ public class WorldServer extends World {
              while (iterator.hasNext()) {
                  EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
@@ -261,10 +261,10 @@ index 06d6275809..259f6fa287 100644
      private void pillagerSettings() {
          pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 712056cad1..c12d52e5df 100644
+index 3afcfeae11..df9e5c6593 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2063,4 +2063,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2068,4 +2068,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end

patches/server/0067-Add-block-and-fluid-tick-events.patch

@@ -1,4 +1,4 @@
-From 12219d4512c64cfd4c3f8cab42083202698c5b31 Mon Sep 17 00:00:00 2001
+From 87e96f6f24a83d3296935af1d348dc4237296d67 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:58:56 -0500
 Subject: [PATCH] Add block and fluid tick events
@@ -10,10 +10,10 @@ Subject: [PATCH] Add block and fluid tick events
  3 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 84c0693303..8ae7b7784c 100644
+index bc02c54526..58d67168e8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -595,7 +595,7 @@ public class WorldServer extends World {
+@@ -604,7 +604,7 @@ public class WorldServer extends World {
                          gameprofilerfiller.enter("randomTick");
                          IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
  
@@ -22,7 +22,7 @@ index 84c0693303..8ae7b7784c 100644
                              iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
                              iblockdata.b(this, blockposition2, this.random);
                              iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
-@@ -603,7 +603,7 @@ public class WorldServer extends World {
+@@ -612,7 +612,7 @@ public class WorldServer extends World {
  
                          Fluid fluid = iblockdata.getFluid();
  
@@ -31,7 +31,7 @@ index 84c0693303..8ae7b7784c 100644
                              fluid.b(this, blockposition2, this.random);
                          }
  
-@@ -692,6 +692,7 @@ public class WorldServer extends World {
+@@ -701,6 +701,7 @@ public class WorldServer extends World {
          Fluid fluid = this.getFluid(nextticklistentry.a);
  
          if (fluid.getType() == nextticklistentry.b()) {
@@ -39,7 +39,7 @@ index 84c0693303..8ae7b7784c 100644
              fluid.a((World) this, nextticklistentry.a);
          }
  
-@@ -701,6 +702,7 @@ public class WorldServer extends World {
+@@ -710,6 +711,7 @@ public class WorldServer extends World {
          IBlockData iblockdata = this.getType(nextticklistentry.a);
  
          if (iblockdata.getBlock() == nextticklistentry.b()) {

patches/server/0089-Add-option-for-zombie-villager-transformation-chance.patch

@@ -1,4 +1,4 @@
-From 3ff46f2bc5a9a15feff9d75edc3284700da89909 Mon Sep 17 00:00:00 2001
+From 6fbed3245a52188efd7c7affccb2fc8ba67dab9b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Dec 2019 16:59:46 -0600
 Subject: [PATCH] Add option for zombie villager transformation chance

patches/server/0089-Don-t-load-Chunks-from-Hoppers-and-other-things.patch

@@ -1,39 +0,0 @@
-From 97b54501b4a9c1796bd79f714ff88a949c1dc4dd Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Nov 2016 20:28:12 -0400
-Subject: [PATCH] Don't load Chunks from Hoppers and other things
-
-Hoppers call this to I guess "get the primary side" of a double sided chest.
-
-If the double sided chest crosses chunk lines, it causes the chunk to load.
-This will end up causing sync chunk loads, which will unload with Chunk GC,
-only to be reloaded again the next tick.
-
-This of course is undesirable, so just return the loaded side as "primary"
-and treat it as a single chest if the other sides are unloaded
----
- src/main/java/net/minecraft/server/DoubleBlockFinder.java | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/java/net/minecraft/server/DoubleBlockFinder.java b/src/main/java/net/minecraft/server/DoubleBlockFinder.java
-index 3cb6e6089..7a16a3e0e 100644
---- a/src/main/java/net/minecraft/server/DoubleBlockFinder.java
-+++ b/src/main/java/net/minecraft/server/DoubleBlockFinder.java
-@@ -21,8 +21,12 @@ public class DoubleBlockFinder {
-                 return new DoubleBlockFinder.Result.Single<>(s0);
-             } else {
-                 BlockPosition blockposition1 = blockposition.shift((EnumDirection) function1.apply(iblockdata));
--                IBlockData iblockdata1 = generatoraccess.getType(blockposition1);
--
-+                // Paper start - don't load chunks if the other side of the chest is in unloaded chunk
-+                IBlockData iblockdata1 = generatoraccess.getTypeIfLoaded(blockposition1);
-+                if (iblockdata1 == null) {
-+                    return new DoubleBlockFinder.Result.Single<>(s0);
-+                }
-+                // Paper end
-                 if (iblockdata1.getBlock() == iblockdata.getBlock()) {
-                     DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1);
- 
--- 
-2.24.0.rc1
-

patches/server/0090-Add-natural-cat-spawning-options.patch

@@ -1,4 +1,4 @@
-From 5dfba45d55c57a95b360638215c5d8cc3f4070ec Mon Sep 17 00:00:00 2001
+From 5b069fb531f188e9fbdf32c49a8836169d78d8f0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 18:52:55 -0600
 Subject: [PATCH] Add natural cat spawning options
@@ -54,7 +54,7 @@ index 6024478dc0..034b973365 100644
          return list.size() < 1 ? this.a(blockposition, world) : 0;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b4f5599661..0a933e29a4 100644
+index 17fe278a33..060eac7121 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -189,6 +189,15 @@ public class PurpurWorldConfig {

patches/server/0091-Add-player-death-exp-control-options.patch

@@ -1,4 +1,4 @@
-From 6008fe12c4429329fd28edcbe7cde65560146f97 Mon Sep 17 00:00:00 2001
+From 78814b9dd98e6a67af2e12a03e4934545c92c071 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options
@@ -35,7 +35,7 @@ index 3957daf751..15e342454c 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0a933e29a4..60ba8c1e9b 100644
+index 060eac7121..8bde402422 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -167,6 +167,13 @@ public class PurpurWorldConfig {

patches/server/0092-Add-permission-for-F3-N-debug.patch

@@ -1,4 +1,4 @@
-From 58c42c906efcb19a5f6f3bc28d589165f96c5f39 Mon Sep 17 00:00:00 2001
+From d68dc2c5a6cb27488c852b356336f27e6697da48 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug
@@ -8,7 +8,7 @@ Subject: [PATCH] Add permission for F3+N debug
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6398c367f..c48933cd6 100644
+index 6398c367f9..c48933cd6f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -904,6 +904,7 @@ public abstract class PlayerList {

patches/server/0093-Add-obfhelpers-for-plugin-use.patch

@@ -1,4 +1,4 @@
-From e10c4496cf515b8cf935b9622dbfaf26e96bddab Mon Sep 17 00:00:00 2001
+From 3ed90a827a45880fa95d0f568ffb6839c9c75372 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Jan 2020 20:12:39 -0600
 Subject: [PATCH] Add obfhelpers for plugin use

patches/server/0094-Fix-non-black-cat-types-spawning-in-swamp-huts.patch

@@ -1,4 +1,4 @@
-From 9a41f2be0f54b9220fb0202039dd569fa957daa2 Mon Sep 17 00:00:00 2001
+From fd0d87510ff9ad11838051d54a504d65886ddfcc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 01:23:22 -0600
 Subject: [PATCH] Fix non black cat types spawning in swamp huts

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

@@ -1,4 +1,4 @@
-From a652ba103f160888434109e739fa845e8f146654 Mon Sep 17 00:00:00 2001
+From 2919990cd68d4e56d4d4f888e12c908fba2f39f2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable
@@ -38,7 +38,7 @@ index 39252e6873..75f8441ab6 100644
          return this.d;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 60ba8c1e9b..01029e504f 100644
+index 8bde402422..57fbb298d3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -150,8 +150,12 @@ public class PurpurWorldConfig {

patches/server/0096-Allow-beehives-to-generate-with-saplings.patch

@@ -1,4 +1,4 @@
-From 6ae6c2225a23e5c65f3c362d5ae6fcda80bf94a8 Mon Sep 17 00:00:00 2001
+From 14fc70da2db7f629b523dac319b2d42a009d48b0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Jan 2020 11:41:38 -0600
 Subject: [PATCH] Allow beehives to generate with saplings

patches/server/0097-Add-configurable-beehive-generation-chance.patch

@@ -1,4 +1,4 @@
-From 04ca8f191b83e609498db65956691ecdceeaae62 Mon Sep 17 00:00:00 2001
+From f6ad73931538ad5b6372b2f9093b6e296495bbd8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Jan 2020 12:07:28 -0600
 Subject: [PATCH] Add configurable beehive generation chance

patches/server/0098-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From 28c39c0411f3142b5be8737704637f3bc95980ed Mon Sep 17 00:00:00 2001
+From 8eddd9ec26a8ff2a6a8d0fc889d487807b9005bc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:52 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
@@ -111,7 +111,7 @@ index 5e99ad8144..42590e2977 100644
                      if (this instanceof EntityPlayer) {
                          ((EntityPlayer) this).a(this.world.worldProvider.getDimensionManager().getType() == DimensionManager.NETHER ? DimensionManager.OVERWORLD : DimensionManager.NETHER, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL);
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 25b694e7df..3712a0410f 100644
+index 25b694e7df..601af0efe4 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -11,6 +11,7 @@ public class PortalTravelAgent {
@@ -141,7 +141,7 @@ index 25b694e7df..3712a0410f 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8ae7b7784c..accf6a730e 100644
+index 58d67168e8..f2f3ebd970 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -65,7 +65,7 @@ public class WorldServer extends World {

patches/server/0099-Prevent-bees-loading-chunks-checking-hive-position.patch

@@ -1,24 +0,0 @@
-From 3ed352531aa30fe7e9e90a625f40e83831e281f6 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 5 Jan 2020 19:21:52 -0600
-Subject: [PATCH] Prevent bees loading chunks checking hive position
-
----
- src/main/java/net/minecraft/server/EntityBee.java | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index 50b3535826..eed821ae26 100644
---- a/src/main/java/net/minecraft/server/EntityBee.java
-+++ b/src/main/java/net/minecraft/server/EntityBee.java
-@@ -399,6 +399,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
-         if (!this.hasHivePos()) {
-             return false;
-         } else {
-+            if (world.getChunkIfLoaded(hivePos) == null) return true; // Purpur - just assume the hive is still there, no need to load the chunk(s)
-             TileEntity tileentity = this.world.getTileEntity(this.hivePos);
- 
-             return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE;
--- 
-2.24.0
-