Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
aa022fda Fix java cross-version compilation
8b7952a9 Implement alternative item-despawn-rate (#2128)
6ccf0bda Reimplement hopper optimization patch (#2388)
e264c365 MC-156852 fix (#2396)
b6c32b2a Fix recursion in EntityFox (#2418)
7c640a1a Updated Upstream (Bukkit/CraftBukkit/Spigot)  (#2415)

current-paper

@@ -1 +1 @@
-1.14.4--69e0726ba05a25f443c8684b3672af7937a3dd96
+1.14.4--843248aa07e132b5f8da61b47c3503c6d73680f1

patches/server/0002-Purpur-config-files.patch

@@ -1,4 +1,4 @@
-From 1407c0bc0a49cbf984e239642fc928b8a38b3b3c Mon Sep 17 00:00:00 2001
+From 49a2ddd3db52136a06a138548d81ad278dc8a29e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -20,7 +20,7 @@ Subject: [PATCH] Purpur config files
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5942c343..750ca972 100644
+index 5942c3438..750ca9727 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -96,10 +96,12 @@ public class PaperConfig {
@@ -37,10 +37,10 @@ index 5942c343..750ca972 100644
  
      static void readConfig(Class<?> clazz, Object instance) {
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 6da54a64..0af08293 100644
+index 5bc19cd08..c2870b054 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -174,6 +174,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -184,6 +184,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
          com.destroystokyo.paper.PaperConfig.registerCommands();
@@ -57,7 +57,7 @@ index 6da54a64..0af08293 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b81b3744..9f657b01 100644
+index b81b37445..9f657b01f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -97,6 +97,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -79,7 +79,7 @@ index b81b3744..9f657b01 100644
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java
 new file mode 100644
-index 00000000..246eb814
+index 000000000..246eb8140
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/Metrics.java
 @@ -0,0 +1,598 @@
@@ -683,7 +683,7 @@ index 00000000..246eb814
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java
 new file mode 100644
-index 00000000..f8cf4ad2
+index 000000000..f8cf4ad23
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
 @@ -0,0 +1,66 @@
@@ -755,7 +755,7 @@ index 00000000..f8cf4ad2
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 00000000..b0f0040a
+index 000000000..b0f0040a4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,133 @@
@@ -894,7 +894,7 @@ index 00000000..b0f0040a
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 00000000..30f11fe2
+index 000000000..30f11fe26
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -0,0 +1,63 @@
@@ -962,7 +962,7 @@ index 00000000..30f11fe2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 162546f2..3fea9de6 100644
+index 18bce6fa3..4cd0bc64b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -793,6 +793,7 @@ public final class CraftServer implements Server {
@@ -990,7 +990,7 @@ index 162546f2..3fea9de6 100644
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1fa81904..2bc8773d 100644
+index 1fa81904d..2bc8773d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -137,6 +137,14 @@ public class Main {

patches/server/0003-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From f25d39f60c6353f670d087988bf56488e86597a3 Mon Sep 17 00:00:00 2001
+From 96390b05dddd5db2d85fac861f902356ec8f8719 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index 0c3ec8357..20c143e31 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3fea9de67..34a6d26a2 100644
+index 4cd0bc64b..c14ca997d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2164,4 +2164,11 @@ public final class CraftServer implements Server {
+@@ -2165,4 +2165,11 @@ public final class CraftServer implements Server {
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
      }
      // Paper end

patches/server/0004-cows-to-mooshroom-when-fed-mushrooms.patch

@@ -1,4 +1,4 @@
-From fae98a1bc8d70db26a9a2a64a5e02586962ab3d0 Mon Sep 17 00:00:00 2001
+From 1e49c1d0ba9fd497dc02f9104398dfe3ead1a9cd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -124,10 +124,10 @@ index d2c2e3cc3..0c00a86a8 100644
      public EntityCow createChild(EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a(this.world);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 31ab07176..5ee807f0e 100644
+index 31d14b19b..ba9b21549 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2742,8 +2742,14 @@ public abstract class EntityLiving extends Entity {
+@@ -2746,8 +2746,14 @@ public abstract class EntityLiving extends Entity {
          this.aM = f;
      }
  

patches/server/0007-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 1c814b48eeea9ba6ee694153404088effb8372b7 Mon Sep 17 00:00:00 2001
+From e86b380d27506dc0ec88722728b583e6d1772139 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:45 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -39,7 +39,7 @@ index 8aa60e95f..e60eedb54 100644
          if (i > 0) {
              this.damageEntity(DamageSource.FALL, (float) i);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5ee807f0e..0054d3bed 100644
+index ba9b21549..a661d109d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -50,7 +50,7 @@ index 5ee807f0e..0054d3bed 100644
      boolean forceDrops;
      ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
      public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -1530,7 +1531,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1534,7 +1535,7 @@ public abstract class EntityLiving extends Entity {
          super.b(f, f1);
          MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
          float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);

patches/server/0010-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From 886717839c490903c3070917cff8e93e99aaf574 Mon Sep 17 00:00:00 2001
+From 014a3286a45553421e3151fb625b2b0e4298433e 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
@@ -1251,7 +1251,7 @@ index 8e463111b..2c34ab337 100644
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
          this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D));
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0054d3bed..2b7925b5d 100644
+index a661d109d..545283ed7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity {
@@ -1289,7 +1289,7 @@ index 0054d3bed..2b7925b5d 100644
      }
  
      protected void co() {
-@@ -2035,7 +2044,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2039,7 +2048,7 @@ public abstract class EntityLiving extends Entity {
          return 0.42F;
      }
  
@@ -1298,7 +1298,7 @@ index 0054d3bed..2b7925b5d 100644
          float f;
  
          if (this.hasEffect(MobEffects.JUMP)) {
-@@ -2046,6 +2055,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2050,6 +2059,7 @@ public abstract class EntityLiving extends Entity {
  
          Vec3D vec3d = this.getMot();
  
@@ -1306,7 +1306,7 @@ index 0054d3bed..2b7925b5d 100644
          this.setMot(vec3d.x, (double) f, vec3d.z);
          if (this.isSprinting()) {
              float f1 = this.yaw * 0.017453292F;
-@@ -2264,10 +2274,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2268,10 +2278,12 @@ public abstract class EntityLiving extends Entity {
          return this.onGround ? this.db() * (0.21600002F / (f * f * f)) : this.aO;
      }
  
@@ -2159,7 +2159,7 @@ index 253ff9594..af3876a6c 100644
  
          this.setMot(vec3d.x, 0.41999998688697815D, vec3d.z);
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 42d0c0017..984747f99 100644
+index 4e9cc7137..42bb90b9c 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 {

patches/server/0014-Add-regen-effect-to-campfires.patch

@@ -1,4 +1,4 @@
-From 501ec3f6de8125b8778abc19caf2961b5584cfab Mon Sep 17 00:00:00 2001
+From 32ebf82f0284a63de5bcf419010cb4fd26cd4ba2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 19 May 2019 18:11:53 -0500
 Subject: [PATCH] Add regen effect to campfires
@@ -11,10 +11,10 @@ Subject: [PATCH] Add regen effect to campfires
  4 files changed, 91 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2b7925b5..8b6dd452 100644
+index 545283ed7..587fe2b36 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2715,10 +2715,19 @@ public abstract class EntityLiving extends Entity {
+@@ -2719,10 +2719,19 @@ public abstract class EntityLiving extends Entity {
      }
  
      public boolean hasLineOfSight(Entity entity) {
@@ -38,7 +38,7 @@ index 2b7925b5..8b6dd452 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
-index 99833655..2642e86f 100644
+index 998336557..2642e86f7 100644
 --- a/src/main/java/net/minecraft/server/EntityPotion.java
 +++ b/src/main/java/net/minecraft/server/EntityPotion.java
 @@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
@@ -82,7 +82,7 @@ index 99833655..2642e86f 100644
          AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
          List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
 diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
-index 2317adde..f112a848 100644
+index 2317adde4..f112a848f 100644
 --- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
 +++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
 @@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -151,7 +151,7 @@ index 2317adde..f112a848 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 30f11fe2..314fd584 100644
+index 30f11fe26..314fd584b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -60,4 +60,27 @@ public class PurpurWorldConfig {

patches/server/0029-Disable-loot-drops-on-death-by-cramming.patch

@@ -1,4 +1,4 @@
-From c063618d12d6ab7b40e86dd82bf0fd03c874261c Mon Sep 17 00:00:00 2001
+From f445b1fc28a3a5060fc83b4828e9d29a5fc2c421 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 3 Jul 2019 23:58:31 -0500
 Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,12 +9,12 @@ Subject: [PATCH] Disable loot drops on death by cramming
  2 files changed, 7 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8b6dd4527..aa60c0084 100644
+index 587fe2b36..89e5d01aa 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1420,8 +1420,10 @@ public abstract class EntityLiving extends Entity {
- 
-         org.bukkit.event.entity.EntityDeathEvent deathEvent = null; // Paper
+@@ -1423,8 +1423,10 @@ public abstract class EntityLiving extends Entity {
+         this.cF(); // CraftBukkit - from below // PAIL
+         org.bukkit.event.entity.EntityDeathEvent deathEvent; // Paper
          if (this.isDropExperience() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
 +            if (!(damagesource == DamageSource.CRAMMING && net.pl3x.purpur.PurpurConfig.disableDropsOnCrammingDeath)) { // Purpur - do not drop loot if crammed to death
              this.a(damagesource, flag);
@@ -22,7 +22,7 @@ index 8b6dd4527..aa60c0084 100644
 +            } // Purpur - do not drop loot if crammed to death
              // CraftBukkit start - Call death event
              deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
-             if (!deathEvent.isCancelled()) this.drops = new ArrayList<org.bukkit.inventory.ItemStack>(); // Paper
+         } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index 40b28ebe5..412a120e2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java

patches/server/0043-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From 2611b16865eef20db3a3fe08fcd6e7490ac1e892 Mon Sep 17 00:00:00 2001
+From a8789afaed676f1623db2623f366ff9c1fd0b1df Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 26a30e1c..770d2146 100644
+index 26a30e1c0..770d21468 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1522,6 +1522,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index 26a30e1c..770d2146 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index e516db27..2fb10f6c 100644
+index e516db270..2fb10f6c2 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -316,7 +316,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -45,7 +45,7 @@ index e516db27..2fb10f6c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 8a8acf14..88b94505 100644
+index 8a8acf14a..88b94505c 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -54,7 +54,7 @@ public class EntityBat extends EntityAmbient {
@@ -58,7 +58,7 @@ index 8a8acf14..88b94505 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 32b7f780..b5bcd1f8 100644
+index 32b7f7805..b5bcd1f80 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -71,7 +71,7 @@ index 32b7f780..b5bcd1f8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 2177a437..05a5169c 100644
+index 2177a4370..05a5169c1 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -84,10 +84,10 @@ index 2177a437..05a5169c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index aa60c008..14972386 100644
+index 89e5d01aa..bc701552e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2609,7 +2609,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2613,7 +2613,7 @@ public abstract class EntityLiving extends Entity {
      protected void doTick() {}
  
      protected void collideNearby() {
@@ -96,7 +96,7 @@ index aa60c008..14972386 100644
  
          if (!list.isEmpty()) {
              int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
-@@ -2747,8 +2747,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2751,8 +2751,10 @@ public abstract class EntityLiving extends Entity {
      }
  
      @Override
@@ -110,7 +110,7 @@ index aa60c008..14972386 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index c5b4057c..d5a28392 100644
+index c5b4057c3..d5a28392a 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -82,7 +82,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -123,7 +123,7 @@ index c5b4057c..d5a28392 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 0eeb1105..7c2c3119 100644
+index 0eeb11055..7c2c3119b 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -351,7 +351,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -136,10 +136,10 @@ index 0eeb1105..7c2c3119 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 56488b78..7ef7fe22 100644
+index 56739e6ed..0bac6e424 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
-@@ -32,11 +32,16 @@ public final class IEntitySelector {
+@@ -33,11 +33,16 @@ public final class IEntitySelector {
      }
  
      public static Predicate<Entity> a(Entity entity) {
@@ -158,7 +158,7 @@ index 56488b78..7ef7fe22 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).dG())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f8a35064..f589f0e8 100644
+index f8a350649..f589f0e8b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -146,6 +146,11 @@ public class PurpurConfig {

patches/server/0046-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 5f04038b16fc94277358bd8ee56ad0e4b3ee10eb Mon Sep 17 00:00:00 2001
+From 875c115e2ca08999d98deb68770ab057795ebc5f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  3 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f7e8d2156..cf86ab0f0 100644
+index e9eb126a5..95b996443 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -30,7 +30,7 @@ index f7e8d2156..cf86ab0f0 100644
                          tickSection = curTime;
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 400b7d212..f923291fe 100644
+index f589f0e8b..d48f9371b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -136,6 +136,11 @@ public class PurpurConfig {
@@ -46,10 +46,10 @@ index 400b7d212..f923291fe 100644
      private static void disableDropsOnCrammingDeath() {
          disableDropsOnCrammingDeath = getBoolean("settings.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 34a6d26a2..42b986274 100644
+index c14ca997d..9f11583f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2170,5 +2170,10 @@ public final class CraftServer implements Server {
+@@ -2171,5 +2171,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }

patches/server/0048-Implement-elytra-settings.patch

@@ -1,4 +1,4 @@
-From 94c7706024d3ed24336b9985ceedcf34b8a96620 Mon Sep 17 00:00:00 2001
+From 40f4abacffd4ecc60352c26a17dd7dd218fb5af6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
@@ -13,10 +13,10 @@ Subject: [PATCH] Implement elytra settings
  6 files changed, 50 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 14972386..ab30648a 100644
+index bc701552e..757b47b80 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2588,9 +2588,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2592,9 +2592,16 @@ public abstract class EntityLiving extends Entity {
              if (itemstack.getItem() == Items.ELYTRA && ItemElytra.e(itemstack)) {
                  flag = true;
                  if (!this.world.isClientSide && (this.bp + 1) % 20 == 0) {
@@ -36,7 +36,7 @@ index 14972386..ab30648a 100644
                  }
              } else {
                  flag = false;
-@@ -3232,6 +3239,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3236,6 +3243,7 @@ public abstract class EntityLiving extends Entity {
          }
      }
  
@@ -45,7 +45,7 @@ index 14972386..ab30648a 100644
          this.world.broadcastEntityEffect(this, d(enumitemslot));
      }
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 9e86ef4c..832cea63 100644
+index 9e86ef4ce..832cea636 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -38,6 +38,14 @@ public class ItemFireworks extends Item {
@@ -64,7 +64,7 @@ index 9e86ef4c..832cea63 100644
                          itemstack.subtract(1);
                      } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 41e88916..43e89b99 100644
+index 41e889165..43e89b99b 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -402,7 +402,7 @@ public final class ItemStack {
@@ -90,7 +90,7 @@ index 41e88916..43e89b99 100644
                      if (this.count == 1 && t0 instanceof EntityHuman) {
                          org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this);
 diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java
-index c4081573..28f9f6e4 100644
+index c40815736..28f9f6e40 100644
 --- a/src/main/java/net/minecraft/server/ItemTrident.java
 +++ b/src/main/java/net/minecraft/server/ItemTrident.java
 @@ -93,6 +93,16 @@ public class ItemTrident extends Item {
@@ -111,7 +111,7 @@ index c4081573..28f9f6e4 100644
                          entityhuman.q(20);
                          if (entityhuman.onGround) {
 diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
-index d2eb861a..b89f9fe7 100644
+index d2eb861af..b89f9fe7b 100644
 --- a/src/main/java/net/minecraft/server/Vec3D.java
 +++ b/src/main/java/net/minecraft/server/Vec3D.java
 @@ -93,6 +93,7 @@ public class Vec3D implements IPosition {
@@ -123,7 +123,7 @@ index d2eb861a..b89f9fe7 100644
          return this.x * this.x + this.y * this.y + this.z * this.z;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 83e26324..07d07a5e 100644
+index 7ff20fe08..b1dcb5f8d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -130,4 +130,17 @@ public class PurpurWorldConfig {

patches/server/0050-Add-5-second-tps-average-in-tps.patch

@@ -1,4 +1,4 @@
-From e90835eadca2c179647653d8c5f324457836698d Mon Sep 17 00:00:00 2001
+From fcca21ceed90f2d76e6fa826431205db2351d56b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 28 Jul 2019 01:27:37 -0500
 Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cf86ab0f0..e91f454c6 100644
+index 95b996443..443e0d627 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -174,7 +174,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,10 +52,10 @@ index cf86ab0f0..e91f454c6 100644
                          // Paper end
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 42b986274..20590fbf8 100644
+index 9f11583f0..52298bc5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2008,6 +2008,7 @@ public final class CraftServer implements Server {
+@@ -2009,6 +2009,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

patches/server/0051-Asynchronous-chunk-IO-and-loading.patch

@@ -1,4 +1,4 @@
-From 7aed7be381bea2d92853d9bce1b5095eae5f2cf8 Mon Sep 17 00:00:00 2001
+From d5e9cc74d18901973803a30ca23e71253fcf0960 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -2271,7 +2271,7 @@ index 000000000..03cb8e0b3
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2c6a164f0..64a899abc 100644
+index 3894b0434..054affc7d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -124,11 +124,137 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2803,7 +2803,7 @@ index 23d1935dd..14f8b6104 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e91f454c6..63e12399e 100644
+index 443e0d627..c52295975 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -775,6 +775,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -3318,11 +3318,11 @@ index fd0d2b6e6..4c774e31d 100644
          return this.n;
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 41f1e15cb..3884dd84d 100644
+index a8c8ace46..22144eb00 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
-@@ -340,7 +340,7 @@ public class RegionFile implements AutoCloseable {
-         this.d[j] = i; // Paper - move this to after the write
+@@ -343,7 +343,7 @@ public class RegionFile implements AutoCloseable {
+         this.d[j] = i; // Spigot - move this to after the write
      }
  
 -    public void close() throws IOException {
@@ -3706,7 +3706,7 @@ index e73257f3f..787dc3e88 100644
  
      public void doTick(BooleanSupplier booleansupplier) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a2b6c3c94..69184f724 100644
+index 21f153013..7fe8a5988 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -538,22 +538,23 @@ public class CraftWorld implements World {

patches/server/0054-implement-optional-per-player-mob-spawns.patch

@@ -1,4 +1,4 @@
-From 691eea6b3c187ab8346fab6214379b82c0490055 Mon Sep 17 00:00:00 2001
+From 88eefa693e3cd107d509050841e1a2d478e9b837 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Tue, 11 Jun 2019 22:22:16 -0400
 Subject: [PATCH] implement optional per player mob spawns
@@ -15,10 +15,10 @@ Subject: [PATCH] implement optional per player mob spawns
  8 files changed, 73 insertions(+), 21 deletions(-)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 318a470ee..72b77e27e 100644
+index e7bbeef74..ac9883a4b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -509,6 +509,11 @@ public class PaperWorldConfig {
+@@ -514,6 +514,11 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
@@ -31,10 +31,10 @@ index 318a470ee..72b77e27e 100644
      private void countAllMobsForSpawning() {
          countAllMobsForSpawning = getBoolean("count-all-mobs-for-spawning", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b1bea8f90..c03414f3f 100644
+index 46d38b924..4acc3c4c3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -601,9 +601,22 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -609,9 +609,22 @@ public class ChunkProviderServer extends IChunkProvider {
                                      // Paper start - only allow spawns upto the limit per chunk and update count afterwards
                                      int currEntityCount = object2intmap.getInt(enumcreaturetype);
                                      int difference = k1 - currEntityCount;

patches/server/0057-Fix-MC-156852.patch

@@ -1,24 +0,0 @@
-From 363f7201e87caf5703dacc9c23187341f3898cfa Mon Sep 17 00:00:00 2001
-From: TheGreatKetchup <TheGreatKetchup@users.noreply.github.com>
-Date: Thu, 1 Aug 2019 21:24:30 -0400
-Subject: [PATCH] Fix MC-156852
-
----
- src/main/java/net/minecraft/server/PlayerInteractManager.java | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index e5e9de542..df8a6a7bd 100644
---- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
-+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-@@ -218,6 +218,7 @@ public class PlayerInteractManager {
-                     int j = (int) (f * 10.0F);
- 
-                     this.world.a(this.player.getId(), blockposition, j);
-+                    this.world.notify(blockposition, iblockdata, iblockdata, 0); // Purpur - fix MC-156852
-                     this.player.playerConnection.sendPacket(new PacketPlayOutBlockBreak(blockposition, this.world.getType(blockposition), packetplayinblockdig_enumplayerdigtype, true));
-                     this.l = j;
-                 }
--- 
-2.20.1
-

patches/server/0057-Implement-AFK-options.patch

@@ -1,4 +1,4 @@
-From 1129007b4b28ee14349f7018ef4de740543895e8 Mon Sep 17 00:00:00 2001
+From cd72403d3729650fddebbb1d9065c0eeb9ba2e1f 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 options
@@ -119,7 +119,7 @@ index 9aaa75e95..70fe85279 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 7ef7fe228..915be1a9a 100644
+index 0bac6e424..df79e4af9 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -130,7 +130,7 @@ index 7ef7fe228..915be1a9a 100644
      public static final Predicate<EntityLiving> b = EntityLiving::isAlive;
      public static final Predicate<Entity> c = (entity) -> {
          return entity.isAlive() && !entity.isVehicle() && !entity.isPassenger();
-@@ -22,6 +23,7 @@ public final class IEntitySelector {
+@@ -23,6 +24,7 @@ public final class IEntitySelector {
      public static final Predicate<Entity> f = (entity) -> {
          return !entity.isSpectator();
      };