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/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/0034-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch

@@ -1,109 +0,0 @@
-From ce0bd8b5eab88dfa62e7389e3c8f18d35f3245f9 Mon Sep 17 00:00:00 2001
-From: Phoenix616 <mail@moep.tv>
-Date: Thu, 16 May 2019 01:33:46 +0100
-Subject: [PATCH] Fix MC-113809 Only grow cactus/reeds/bamboo/chorus fruit on
- random tick
-
----
- src/main/java/net/minecraft/server/Block.java             | 1 +
- src/main/java/net/minecraft/server/BlockBamboo.java       | 1 +
- src/main/java/net/minecraft/server/BlockCactus.java       | 1 +
- src/main/java/net/minecraft/server/BlockChorusFlower.java | 1 +
- src/main/java/net/minecraft/server/BlockReed.java         | 1 +
- src/main/java/net/minecraft/server/WorldServer.java       | 2 ++
- src/main/java/net/pl3x/purpur/PurpurConfig.java           | 5 +++++
- 7 files changed, 12 insertions(+)
-
-diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index f9747fb18..4a537d1d7 100644
---- a/src/main/java/net/minecraft/server/Block.java
-+++ b/src/main/java/net/minecraft/server/Block.java
-@@ -31,6 +31,7 @@ public class Block implements IMaterial {
-     protected final boolean q;
-     protected final SoundEffectType stepSound;
-     protected final Material material;
-+    public boolean randomTick = false; // Purpur - fix MC-113809
-     // Paper start
-     public co.aikar.timings.Timing timing;
-     public co.aikar.timings.Timing getTiming() {
-diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
-index ffb65776c..d94368b03 100644
---- a/src/main/java/net/minecraft/server/BlockBamboo.java
-+++ b/src/main/java/net/minecraft/server/BlockBamboo.java
-@@ -85,6 +85,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
-         if (!iblockdata.canPlace(world, blockposition)) {
-             world.b(blockposition, true);
-         } else if ((Integer) iblockdata.get(BlockBamboo.f) == 0) {
-+            if (!randomTick) return; // Purpur - fix MC-113809
-             if (world.random.nextInt(Math.max(1, (int) (100.0F / world.spigotConfig.bambooModifier) * 3)) == 0 && world.isEmpty(blockposition.up()) && world.getLightLevel(blockposition.up(), 0) >= 9) { // Spigot
-                 int i = this.b((IBlockAccess) world, blockposition) + 1;
- 
-diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 29f9ff6c1..375ada5a4 100644
---- a/src/main/java/net/minecraft/server/BlockCactus.java
-+++ b/src/main/java/net/minecraft/server/BlockCactus.java
-@@ -21,6 +21,7 @@ public class BlockCactus extends Block {
-         if (!iblockdata.canPlace(world, blockposition)) {
-             world.b(blockposition, true);
-         } else {
-+            if (!randomTick) return; // Purpur - fix MC-113809
-             BlockPosition blockposition1 = blockposition.up();
- 
-             if (world.isEmpty(blockposition1)) {
-diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java
-index 74fa4889f..bbda083f6 100644
---- a/src/main/java/net/minecraft/server/BlockChorusFlower.java
-+++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java
-@@ -22,6 +22,7 @@ public class BlockChorusFlower extends Block {
-         if (!iblockdata.canPlace(world, blockposition)) {
-             world.b(blockposition, true);
-         } else {
-+            if (!randomTick) return; // Purpur - fix MC-113809
-             BlockPosition blockposition1 = blockposition.up();
- 
-             if (world.isEmpty(blockposition1) && blockposition1.getY() < 256) {
-diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index ff674a9d5..4a13e248e 100644
---- a/src/main/java/net/minecraft/server/BlockReed.java
-+++ b/src/main/java/net/minecraft/server/BlockReed.java
-@@ -23,6 +23,7 @@ public class BlockReed extends Block {
-         if (!iblockdata.canPlace(world, blockposition)) {
-             world.b(blockposition, true);
-         } else if (world.isEmpty(blockposition.up())) {
-+            if (!randomTick) return; // Purpur - fix MC-113809
-             int i;
- 
-             for (i = 1; world.getType(blockposition.down(i)).getBlock() == this; ++i) {
-diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ee3789b38..2e038eb16 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -533,7 +533,9 @@ public class WorldServer extends World {
-                         IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
- 
-                         if (iblockdata.q()) {
-+                            iblockdata.getBlock().randomTick = net.pl3x.purpur.PurpurConfig.fixZeroTickFarms; // Purpur - fix MC-113809
-                             iblockdata.b((World) this, blockposition2, this.random);
-+                            iblockdata.getBlock().randomTick = false; // Purpur - fix MC-113809
-                         }
- 
-                         Fluid fluid = iblockdata.p();
-diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0e3a64e85..f31e7edb2 100644
---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -151,6 +151,11 @@ public class PurpurConfig {
-         fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
-     }
- 
-+    public static boolean fixZeroTickFarms = true;
-+    private static void fixZeroTickFarms() {
-+        fixZeroTickFarms = getBoolean("settings.fix-zero-tick-farms", fixZeroTickFarms);
-+    }
-+
-     public static boolean requireShiftToMount = true;
-     private static void requireShiftToMount() {
-         requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
--- 
-2.23.0.rc1
-

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/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/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/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/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/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/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/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/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/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 {

patches/server/0045-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From 017082af56e65fad89599b0e6aac1d3ac71e4659 Mon Sep 17 00:00:00 2001
+From f210356f0372425ad10c0d1d19a7ae5dc0a8695f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
@@ -40,10 +40,10 @@ index 830d93a85..d1d62a900 100644
          this.world.getMethodProfiler().exit();
          if (!this.dY() && this.bE > 0) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3f3ce537c..dae2fb4de 100644
+index cdfd39374..ed2cdf509 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -235,6 +235,13 @@ public class PurpurConfig {
+@@ -230,6 +230,13 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
  

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

@@ -1,4 +1,4 @@
-From 583da8aa2216a7ff9d38be03aef9b18df7d33b21 Mon Sep 17 00:00:00 2001
+From a0468b7a01c8907e20df05df3e4fe30039379bd2 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

patches/server/0047-Add-option-to-disable-pillager-patrols.patch

@@ -1,4 +1,4 @@
-From 0ef66de9cec3bf747f5c485bc606c89ef520bd80 Mon Sep 17 00:00:00 2001
+From 4d27b6984b51de8a6c2776fad0f52a40c9d4aa23 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 27 Jul 2019 17:20:35 -0500
 Subject: [PATCH] Add option to disable pillager patrols
@@ -21,10 +21,10 @@ index a9d32ebdf..b88040e03 100644
              return 0;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index dae2fb4de..594c50a18 100644
+index ed2cdf509..4243cd4d7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -228,6 +228,11 @@ public class PurpurConfig {
+@@ -223,6 +223,11 @@ public class PurpurConfig {
          pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
      }
  

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

@@ -1,4 +1,4 @@
-From f4f958ee9b4ba86eb7baa0432e253544815f5d58 Mon Sep 17 00:00:00 2001
+From ab5c2851dd98c8826b7b05f51c4fcfa0f9202736 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

patches/server/0049-Rate-limit-packets-incoming-from-players.patch

@@ -1,4 +1,4 @@
-From 4056829c61fd888d9fd34241d1b7f8eb37cca5fd Mon Sep 17 00:00:00 2001
+From 7f9771a3f065bc1ea1b339a1b18bdc1c984ffc8d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 11 Mar 2019 12:18:29 -0700
 Subject: [PATCH] Rate limit packets incoming from players

patches/server/0050-Don-t-recalculate-permissions-for-players-on-world-c.patch

@@ -1,4 +1,4 @@
-From 425bfe01bddd2370ecd7b768e88529dcb571c348 Mon Sep 17 00:00:00 2001
+From 4ce5f542966dc9bf338e7c805858ecb3b549e776 Mon Sep 17 00:00:00 2001
 From: Tom <cryptite@gmail.com>
 Date: Fri, 12 Jul 2019 07:59:35 -0500
 Subject: [PATCH] Don't recalculate permissions for players on world change
@@ -30,10 +30,10 @@ index 3cb443c4f..a33285379 100644
          GameProfile gameprofile = entityplayer.getProfile();
          int i = this.server.a(gameprofile);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 594c50a18..af76bbc3b 100644
+index 4243cd4d7..96461a1cf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -171,6 +171,11 @@ public class PurpurConfig {
+@@ -166,6 +166,11 @@ public class PurpurConfig {
          useBetterMending = getBoolean("settings.use-better-mending", useBetterMending);
      }
  

patches/server/0051-Add-blacklist-option-for-grindstone.patch

@@ -1,4 +1,4 @@
-From e196b6fe7ca404320b8eacb488b5747980802576 Mon Sep 17 00:00:00 2001
+From 4e9868d14c78881570891be09193174eef4f0cac Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 1 Aug 2019 19:15:12 -0500
 Subject: [PATCH] Add blacklist option for grindstone
@@ -68,7 +68,7 @@ index 43e89b99b..e538ba399 100644
          return this.getItem().f(this);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index af76bbc3b..e2b252685 100644
+index 96461a1cf..973cf6586 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,7 @@
@@ -79,7 +79,7 @@ index af76bbc3b..e2b252685 100644
  import net.minecraft.server.Block;
  import net.minecraft.server.IRegistry;
  import net.minecraft.server.MinecraftKey;
-@@ -176,6 +177,17 @@ public class PurpurConfig {
+@@ -171,6 +172,17 @@ public class PurpurConfig {
          updatePermissionsOnWorldChange = getBoolean("settings.update-perms-on-world-change", updatePermissionsOnWorldChange);
      }
  

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

@@ -1,4 +1,4 @@
-From d5fca23e69bb1fe7575ba7b0912dcfe5c41417c8 Mon Sep 17 00:00:00 2001
+From b7a11bc637e705ecbe1fa0543f0e18dd03f94f5f 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
@@ -205,7 +205,7 @@ index 30595523e..6f584d515 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 a63e102d6..b7babc897 100644
+index c048db0d5..587dae858 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -324,7 +324,7 @@ public class WorldServer extends World {

patches/server/0053-Advancement-stuffs.patch

@@ -1,4 +1,4 @@
-From 1f830e8fdf85927d6c97aef02f6f0ba0bf391a15 Mon Sep 17 00:00:00 2001
+From 3417eded091bd2c030ad35dde9a48739601067ca Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 11 Aug 2019 22:25:33 -0500
 Subject: [PATCH] Advancement stuffs

patches/server/0054-Add-option-for-zombies-targetting-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From 7482e89496f62fbf7133ce3b092adb1abe9645e4 Mon Sep 17 00:00:00 2001
+From 91134d37a715a37cfa1c78692ba0f3f094654a9f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -22,10 +22,10 @@ index 96676a786..b426941f5 100644
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.l();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e2b252685..c548af4bf 100644
+index 973cf6586..4f6df3ba6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -264,6 +264,11 @@ public class PurpurConfig {
+@@ -259,6 +259,11 @@ public class PurpurConfig {
          villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
      }
  

patches/server/0055-Implement-bamboo-growth-settings.patch

@@ -1,4 +1,4 @@
-From c7fc75cf4236d8d88a9b0fdd14e377982c829633 Mon Sep 17 00:00:00 2001
+From 731bbc7baab11969ce89f59d0846ccc73bfa249f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 20:57:29 -0500
 Subject: [PATCH] Implement bamboo growth settings
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement bamboo growth settings
  2 files changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
-index d94368b03..24f7c1683 100644
+index 3a9c3b54a..f0401c3e7 100644
 --- a/src/main/java/net/minecraft/server/BlockBamboo.java
 +++ b/src/main/java/net/minecraft/server/BlockBamboo.java
 @@ -89,7 +89,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {

patches/server/0056-Option-for-slimes-not-pushable.patch

@@ -1,4 +1,4 @@
-From 1af46e167d7e6118cf4f13aaa95bf7a5064af5fc Mon Sep 17 00:00:00 2001
+From 5d0c14864d709c29c6287a7a67a442ffcbb7d44d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 21:56:31 -0500
 Subject: [PATCH] Option for slimes not pushable
@@ -23,10 +23,10 @@ index fd54958f6..0f4cdd5ed 100644
 +    }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c548af4bf..868271fa1 100644
+index 4f6df3ba6..14930aea7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -286,6 +286,17 @@ public class PurpurConfig {
+@@ -281,6 +281,17 @@ public class PurpurConfig {
          InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
      }
  

patches/server/0057-Ender-Dragon-always-drops-full-exp.patch

@@ -1,4 +1,4 @@
-From 93bd3c61e49ae4399d44511ebfd63f5d80b91755 Mon Sep 17 00:00:00 2001
+From 677d5921a07b7d736b0b335cad965c5f7ef309f6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 24 Aug 2019 14:42:54 -0500
 Subject: [PATCH] Ender Dragon always drops full exp
@@ -22,10 +22,10 @@ index 6a6367a2e..578676fec 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 868271fa1..bb0cf2d0a 100644
+index 14930aea7..46c31ad1c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -199,6 +199,7 @@ public class PurpurConfig {
+@@ -194,6 +194,7 @@ public class PurpurConfig {
      }
  
      public static boolean enderDragonAlwaysDropsEggBlock = false;
@@ -33,7 +33,7 @@ index 868271fa1..bb0cf2d0a 100644
      private static void enderDragonSettings() {
          if (version < 2) {
              boolean oldValue = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
-@@ -207,6 +208,7 @@ public class PurpurConfig {
+@@ -202,6 +203,7 @@ public class PurpurConfig {
              set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
          }
          enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);

patches/server/0058-Dispenser-curse-of-binding-protection.patch

@@ -1,4 +1,4 @@
-From ab7ff9d590be6e82071b6bdae20dc7669d154703 Mon Sep 17 00:00:00 2001
+From 070bf398cc0469574042f361707af5bdb9ee3db0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection

patches/server/0059-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch

@@ -1,4 +1,4 @@
-From 7bf0c70941d1bc10251b785b1783f78466c7e2be Mon Sep 17 00:00:00 2001
+From 0b76e89f23f92f891c5da98871e30e03cbff759b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 30 Aug 2019 18:56:32 -0500
 Subject: [PATCH] Fix stuck in sneak when changing worlds MC-10657

patches/server/0060-Add-killer-rabbit-natural-spawn-chance.patch

@@ -1,4 +1,4 @@
-From b8058776a009869ee20456729f89b913dfd98555 Mon Sep 17 00:00:00 2001
+From 31a6fc0ab24d9bf15a8fb32cf890d85e67e5e960 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 31 Aug 2019 17:24:41 -0500
 Subject: [PATCH] Add killer rabbit natural spawn chance
@@ -22,10 +22,10 @@ index d48610df3..498c453d7 100644
          int i = this.random.nextInt(100);
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bb0cf2d0a..48a8907db 100644
+index 46c31ad1c..d03b96bcc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -252,6 +252,11 @@ public class PurpurConfig {
+@@ -247,6 +247,11 @@ public class PurpurConfig {
          disablePillagerPatrols = getBoolean("settings.mobs.pillager.disable-patrols", disablePillagerPatrols);
      }
  

patches/server/0061-Add-option-to-spawn-Toast.patch

@@ -1,4 +1,4 @@
-From d730d44cdf8403dcfc8df7139f0e8b7d1fd3e960 Mon Sep 17 00:00:00 2001
+From 2d0870d724ac31c6cee1b48429f036a548d40fcb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 31 Aug 2019 17:47:11 -0500
 Subject: [PATCH] Add option to spawn Toast
@@ -30,10 +30,10 @@ index 498c453d7..41d8d1ccb 100644
          BiomeBase biomebase = generatoraccess.getBiome(new BlockPosition(this));
          int i = this.random.nextInt(100);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 48a8907db..357de5178 100644
+index d03b96bcc..644ad14b3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -253,8 +253,10 @@ public class PurpurConfig {
+@@ -248,8 +248,10 @@ public class PurpurConfig {
      }
  
      public static double killerRabbitChance = 0.0D;

patches/server/0062-Expose-internal-current-tick.patch

@@ -1,4 +1,4 @@
-From f19d0643ea0a1abc2d6acdc9af45701d29d16fd0 Mon Sep 17 00:00:00 2001
+From a7144d19244acb40588253a5f6f04de9f16c4498 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 1 Sep 2019 17:22:43 -0500
 Subject: [PATCH] Expose internal current tick

patches/server/0063-Add-option-for-boats-to-eject-players-on-land.patch

@@ -1,4 +1,4 @@
-From b225bc75544ee8499002e7824a28a6b8217e3db7 Mon Sep 17 00:00:00 2001
+From 48da1b6628c22b4200913702f32acfc3e0334f6e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land