Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7caed1a8 [CI-SKIP] Rebuild patches
777073a5 Check horse entity validity in container interactions (#2584)
d69fe6c5 Fix zero-tick instant grow farms MC-113809 (#2559)
c68dbb86 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576)
1e521994 Update Paperclip
30f9955e Fix race conditions in flush allowing for previously scheduled tasks to execute later than the flush call (#2548)
9e1620e3 Improve save logic (#2485)
72860501 [CI-SKIP] Fix duplicate patch number
87355875 Fix nether portal frame creation (#2546)
26acc9b7 Re-add flat bedrock config option

current-paper

@@ -1 +1 @@
-1.14.4--746152692f785f64c751f88df532012556f153cd
+1.14.4--1e644dbf6e7d38515e9a3dce22b59c2f6c6eda9c

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

@@ -1,4 +1,4 @@
-From e86b380d27506dc0ec88722728b583e6d1772139 Mon Sep 17 00:00:00 2001
+From b5eeca0365ecd96c0772b82a84179b77bbb1b89d 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 ba9b21549..a661d109d 100644
+index 0abca1a5b..4b59f6081 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 {
@@ -73,10 +73,10 @@ index d052dedec..a5dade7d0 100644
          if (i > 0) {
              if (f >= 6.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e0de3820f..18d057f0e 100644
+index b27fd44dc..33f56b85e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -699,4 +699,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -712,4 +712,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().isHandRaised();
      }
      // Paper end
@@ -94,5 +94,5 @@ index e0de3820f..18d057f0e 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0008-Silk-touch-spawners.patch

@@ -1,4 +1,4 @@
-From 8d144c45e81724e07c172eb3f7d06f6e4f105dfa Mon Sep 17 00:00:00 2001
+From 95b2eda9ffd59fe885bc6ea528a6913d9586581b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 14:27:37 -0500
 Subject: [PATCH] Silk touch spawners
@@ -13,10 +13,10 @@ Subject: [PATCH] Silk touch spawners
  create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e077359b0..36c84d75e 100644
+index 619237d68..a0177d8c0 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
-@@ -493,6 +493,7 @@ public class Block implements IMaterial {
+@@ -494,6 +494,7 @@ public class Block implements IMaterial {
          iblockdata.dropNaturally(world, blockposition, itemstack);
      }
 

patches/server/0010-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From d8e3436095e2e0b4b6910f143684a9c1fcc07f20 Mon Sep 17 00:00:00 2001
+From 0cee0c4b5ebb3c7301a90f9888de6d2750cbbac5 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
@@ -3186,10 +3186,10 @@ 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 18d057f0e..93aede13c 100644
+index 33f56b85e..ffd137228 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -710,5 +710,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -723,5 +723,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setSafeFallDistance(float safeFallDistance) {
          getHandle().safeFallDistance = safeFallDistance;
      }

patches/server/0015-Campfires-should-fall-with-gravity.patch

@@ -1,4 +1,4 @@
-From 164950dc3352130385909359c73009abaee9eaaa Mon Sep 17 00:00:00 2001
+From ac356c05ef43bc12cf80573c18c57ee924fae231 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 16:20:21 -0500
 Subject: [PATCH] Campfires should fall with gravity
@@ -10,10 +10,10 @@ Subject: [PATCH] Campfires should fall with gravity
  3 files changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 36c84d75e..f9747fb18 100644
+index a0177d8c0..56def823e 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
-@@ -375,6 +375,7 @@ public class Block implements IMaterial {
+@@ -376,6 +376,7 @@ public class Block implements IMaterial {
          PacketDebug.a(world, blockposition);
      }
 
@@ -22,7 +22,7 @@ index 36c84d75e..f9747fb18 100644
          return 10;
      }
 diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
-index bfac5835c..d2363d1d2 100644
+index 9d59e339c..121433a4e 100644
 --- a/src/main/java/net/minecraft/server/BlockCampfire.java
 +++ b/src/main/java/net/minecraft/server/BlockCampfire.java
 @@ -72,8 +72,32 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -68,7 +68,7 @@ index bfac5835c..d2363d1d2 100644
 
              if (flag) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cea2bcad5..dc2da586e 100644
+index 314fd584b..871c0e234 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -61,6 +61,11 @@ public class PurpurWorldConfig {
@@ -84,5 +84,5 @@ index cea2bcad5..dc2da586e 100644
      public int campfireRegenDuration = 80;
      public int campfireRegenRange = 5;
 -- 
-2.20.1
+2.23.0.rc1
 

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

@@ -1,4 +1,4 @@
-From e6ce7a5a4bf53e30264a7a62398b3b36eaccc3b7 Mon Sep 17 00:00:00 2001
+From 78d134d266a59ec0719c4dd9ab9e1ac199d4e1cd 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,7 +9,7 @@ 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 2e038eb16..a63e102d6 100644
+index 7a0b657f2..c048db0d5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -483,12 +483,18 @@ public class WorldServer extends World {
@@ -38,10 +38,10 @@ index 2e038eb16..a63e102d6 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 f31e7edb2..4973d7089 100644
+index 0e3a64e85..538ebb7fd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -210,6 +210,11 @@ public class PurpurConfig {
+@@ -205,6 +205,11 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
 

patches/server/0036-Fix-pig-zombies-MC-56653.patch → patches/server/0035-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From b3c2caf86c47598936242e0e4ee4350e9cedb300 Mon Sep 17 00:00:00 2001
+From 731b54cf166d56b856ece3056ad504747b3813c7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -43,10 +43,10 @@ index 5760a1836..54ccc93f1 100644
 
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4973d7089..308440e81 100644
+index 538ebb7fd..4ce905aba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -203,6 +203,11 @@ public class PurpurConfig {
+@@ -198,6 +198,11 @@ public class PurpurConfig {
          phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
      }
 

patches/server/0037-Option-to-toggle-milk-curing-bad-omen.patch → patches/server/0036-Option-to-toggle-milk-curing-bad-omen.patch

@@ -1,4 +1,4 @@
-From 161868e02a53ea13a1a1a8340f04cf4b5b8c6e4a Mon Sep 17 00:00:00 2001
+From 69541720f176d5362e4068f683bbfe095c611094 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 10 Jul 2019 20:43:05 -0500
 Subject: [PATCH] Option to toggle milk curing bad omen

patches/server/0038-Implement-ChunkTooLargeEvent.patch → patches/server/0037-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From c2815d499228d60c29927b51f46a736a99ab4d47 Mon Sep 17 00:00:00 2001
+From fdf5cf1d6672ea52a1e10f27e78c89e4462475de Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:10:06 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent

patches/server/0039-Tulips-change-fox-type.patch → patches/server/0038-Tulips-change-fox-type.patch

@@ -1,4 +1,4 @@
-From ea954955e70bce65fef4dad7643d85a4a5c774ca Mon Sep 17 00:00:00 2001
+From db1134d18580098af96f8ac877101f8883bcdc4a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type
@@ -77,10 +77,10 @@ index 987297634..eed256349 100644
      public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
      public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 308440e81..6aa8756f4 100644
+index 4ce905aba..c4f1ab8f2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -177,6 +177,11 @@ public class PurpurConfig {
+@@ -172,6 +172,11 @@ public class PurpurConfig {
          enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
      }
 

patches/server/0040-Mending-mends-most-damages-equipment-first.patch → patches/server/0039-Mending-mends-most-damages-equipment-first.patch

@@ -1,4 +1,4 @@
-From 8ceeb019a4672fd171c39be296a518c58c73cd93 Mon Sep 17 00:00:00 2001
+From 946948609b0de44f1f30e6393d006861146baf51 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first
@@ -86,11 +86,11 @@ index 0e164840f..41e889165 100644
          return this.tag == null ? 0 : this.tag.getInt("Damage");
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6aa8756f4..637d662ad 100644
+index c4f1ab8f2..0cdb4bbaf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -156,6 +156,11 @@ public class PurpurConfig {
-         fixZeroTickFarms = getBoolean("settings.fix-zero-tick-farms", fixZeroTickFarms);
+@@ -151,6 +151,11 @@ public class PurpurConfig {
+         fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
      }
 
 +    public static boolean useBetterMending = true;

patches/server/0041-Players-should-not-cram-to-death.patch → patches/server/0040-Players-should-not-cram-to-death.patch

@@ -1,4 +1,4 @@
-From 06a7923a7875817c27cb93db229236f10ffb7603 Mon Sep 17 00:00:00 2001
+From aff8536930249c18ed0448d8627de98e359c6ef6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death

patches/server/0042-Ladders-should-not-bypass-cramming-gamerule.patch → patches/server/0041-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From e03fb6aaefc02582d96f392c859a912568bcfdaa Mon Sep 17 00:00:00 2001
+From 2a3b0f606831fe8bbacd2f7f1a8d4da080ac481f 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
@@ -158,7 +158,7 @@ index 56739e6ed..0bac6e424 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 637d662ad..a4b5b871d 100644
+index 0cdb4bbaf..b38de26d6 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/0043-Implement-a-hard-limit-for-pillager-outpost-spawns.patch → patches/server/0042-Implement-a-hard-limit-for-pillager-outpost-spawns.patch

@@ -1,4 +1,4 @@
-From a5d54a67d7810d520eff68b1aa6cd10f5ef3ed41 Mon Sep 17 00:00:00 2001
+From 9384dee8945bc47a570c822953cb965ae9275caf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns

patches/server/0044-Implement-configurable-search-radius-for-villagers-t.patch → patches/server/0043-Implement-configurable-search-radius-for-villagers-t.patch

@@ -1,4 +1,4 @@
-From d262588dfcfbf2c1e0740da0895679af1a9313ed Mon Sep 17 00:00:00 2001
+From affa6df535d45ccc3c6a7194d88f7817d7e6671f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn

patches/server/0045-Implement-lagging-threshold.patch → patches/server/0044-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From fc2e5f815d338f68d7cef2c1c865bef56c76a396 Mon Sep 17 00:00:00 2001
+From 2b5bdf675e9be4b6fc7f120d56d693e1fcfbdb70 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
@@ -30,7 +30,7 @@ index dcb783407..427c1da00 100644
                          tickSection = curTime;
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a4b5b871d..3f3ce537c 100644
+index b38de26d6..cdfd39374 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 {