Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8812fed9 Merge pull request #2240 from Spottedleaf/anti-xray
bd46b639 Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray
e679a7c1 Config migrations
0a667728 Resolve crash issue by shoving chunk loads onto the next tick
3a2d7f2d Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray
5ffa0dae Do not force load chunks for plugin constructed packets
e993aa6f Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray
9a4a185f Keep neighbour chunks loaded while obfuscating
f1f8060a Fix build?
76eb2a5e Use getChunkIfLoadedImmediately not getChunkIfCachedImmediately
ad757f96 Delete 0335-Anti-Xray.patch
46a6f1b2 Re-Add Anti-Xray

current-paper

@@ -1 +1 @@
-1.14.3--4c1649da0b697c9076f3809c18867830e4490744
+1.14.3--10d7502e7fcd7fd8d163ee56f034dc4a02ca3ef1

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

@@ -1,4 +1,4 @@
-From 2e9eb1dadfd676fce0e6e5a18cb5e80722cdf531 Mon Sep 17 00:00:00 2001
+From b1ad4714c121f84b34a056cb3954ed0960487200 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
@@ -37,22 +37,22 @@ index c1473330f..f438323be 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a7a35d6a6..c8f198fdf 100644
+index ee6474b18..c86c9d1ec 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
- 
+@@ -97,6 +97,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
      public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
+     public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
 +    public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
 +
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPosition lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -134,6 +136,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
-     protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
+@@ -138,6 +140,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
+         this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);

patches/server/0036-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From b1040138626c7cdb83910b7e0caff26e4be6fce9 Mon Sep 17 00:00:00 2001
+From 41c5e35813ee98cc04ca1a8287ce5db312c37895 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ca429be7d..ee099b672 100644
+index e8b5729ef..553975c46 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1294,6 +1294,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

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

@@ -1,4 +1,4 @@
-From 0a5c87d6539c256647205f6fb63450f581a139ea Mon Sep 17 00:00:00 2001
+From 506787fba7dcb7fa1f77a9492d8649df5f7f9f50 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

patches/server/0038-Make-illusioners-naturally-spawn.patch

@@ -1,4 +1,4 @@
-From 1da508750fdc4ae0a1a5833518aee4ea99455bd5 Mon Sep 17 00:00:00 2001
+From de0894c8d4724da12f1af6da50757e75a815487f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 11:09:25 -0500
 Subject: [PATCH] Make illusioners naturally spawn

patches/server/0039-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From 3da9a55c19a7080d6976b28f8c51be51f8f711c5 Mon Sep 17 00:00:00 2001
+From 74764f2e4f4819a686edadf3b1bbda95976f61ed Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:36:55 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg

patches/server/0040-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From a24211c391399fb7eb0a9c83144d59f4e56deea2 Mon Sep 17 00:00:00 2001
+From 2d91e9b0c03ba642bd9cc16efdba4910160d2700 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:00 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent

patches/server/0041-Dont-send-useless-entity-packets.patch

@@ -1,4 +1,4 @@
-From d215f19056052a7b6c97d08f4aeb7a0d4c96be5c Mon Sep 17 00:00:00 2001
+From f3cdef46566d4a050797c9032b9e077fed7b993e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets

patches/server/0042-Fix-item-position-desync-MC-4.patch

@@ -1,4 +1,4 @@
-From b789db7a834c56cb7413e2788adc4cc49b40ec9c Mon Sep 17 00:00:00 2001
+From a6ddcee433c98172297a637065c877177be2105d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] Fix item position desync (MC-4)

patches/server/0043-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch

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

patches/server/0044-Teleport-with-vehicle-passenger.patch

@@ -1,4 +1,4 @@
-From 9a32aad9bf45cc48458b9ec1615342915b48c8a7 Mon Sep 17 00:00:00 2001
+From cfc0e6ba5c3aca2801275d1785a62d7f8a9efad7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 18:25:05 -0500
 Subject: [PATCH] Teleport with vehicle/passenger

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

@@ -1,4 +1,4 @@
-From 10fdd39e9046b121727f0a788295be39ad413fdd Mon Sep 17 00:00:00 2001
+From 8a66ded4d1094109f614eea91d247b291019e5d9 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

patches/server/0046-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From fa186a81a6bf37a7064ac6256a3c37221cf50a5b Mon Sep 17 00:00:00 2001
+From 073447c8b445d54114464e3faa0e300454e16933 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)