Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
34e5942b Fix timings task name generation for extreme cases - Fixes #3499
5e3bacbc Ensure ThreadDeath propagates fully - Fixes #3521
9fa6ba26 Optimize Light Engine
dfd3848e Use seed based lookup for Treasure Maps - Fixes lag from carto/sunken maps
74dcb3c9 Revert "Fix enchantment costs (#3519)"
6d72ea16 Fix enchantment costs (#3519)
68cc8d79 Maps shouldn't load chunks (#3518)
e7cf34a0 Fix villager trading demand MC-163962 (#3498)
51f9edf2 Change name and id to get from profile in AsyncPlayerPreLoginEvent (#3511)

patches/server/0088-UPnP-Port-Forwarding-Service.patch

@@ -1,4 +1,4 @@
-From 8f6c7225516af03ef09c572bb0476341939dd523 Mon Sep 17 00:00:00 2001
+From 0932808f41571426fa90c5d6336e6a0451e113fe Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service
@@ -78,7 +78,7 @@ index 73d2b32c5c..a522ed5c36 100644
          // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
          server.loadPlugins();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 426cde31a1..50922dd367 100644
+index fd9e8db0b6..57acbbce17 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -89,9 +89,9 @@ index 426cde31a1..50922dd367 100644
  
      public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
          super("Server");
-@@ -737,6 +738,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -744,6 +745,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // CraftBukkit end
-         MinecraftServer.LOGGER.info("Stopping server");
+         MinecraftServer.LOGGER.info("Stopping server (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER)"); // Paper
          MinecraftTimings.stopServer(); // Paper
 +        // Purpur start
 +        if (upnp) {
@@ -196,5 +196,5 @@ index 0000000000..b0465d3608
 +    }
 +}
 -- 
-2.24.0
+2.26.2