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)

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 {