Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ffecc4e2 Revert "Optimize entity list iteration requiring entities be in"
0a4286cc Prevent Fire from loading chunks
07915ea1 Add Player Client Options API (#2883)
bc48a317 Optimize entity list iteration requiring entities be in  loaded chunks
88092fef Optimize ChunkProviderServer's chunk level checking helper methods
01e8ce8d Forced Watchdog Crash support and Improve Async Shutdown
fdb8fe78 Be less strict with vanilla teleport command limits

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

@@ -1,4 +1,4 @@
-From 2a12603d40aef4ce8c5de8d7603ffbcbd84b292f Mon Sep 17 00:00:00 2001
+From 8bee092c8f217306aa04de3bab74a97f77b96fdf 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
@@ -6,11 +6,11 @@ Subject: [PATCH] UPnP Port Forwarding Service
 ---
  pom.xml                                       | 10 ++++
  .../net/minecraft/server/DedicatedServer.java | 25 ++++++++++
- .../net/minecraft/server/MinecraftServer.java | 12 +++++
+ .../net/minecraft/server/MinecraftServer.java | 10 ++++
  .../java/net/pl3x/purpur/PurpurConfig.java    |  5 ++
  .../net/pl3x/purpur/gui/info/JInfoPanel.java  |  3 ++
  .../pl3x/purpur/gui/info/UPnPComponent.java   | 47 +++++++++++++++++++
- 6 files changed, 102 insertions(+)
+ 6 files changed, 100 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 
 diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@ index a7ee9396a0..93fba088f4 100644
  
      <pluginRepositories>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index bd9c123d56..7e8286b573 100644
+index fe474e4eba..18fdaf53ef 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -78,10 +78,10 @@ index bd9c123d56..7e8286b573 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 69970e0ab9..fab3e3d784 100644
+index 1f1d2745d7..fc255ddfd1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -186,6 +186,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public boolean lagging = false; // Purpur
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
@@ -89,11 +89,10 @@ index 69970e0ab9..fab3e3d784 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");
-@@ -796,6 +797,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         }
-         // Spigot end
-         com.destroystokyo.paper.io.PaperFileIOThread.Holder.INSTANCE.close(true, true); // Paper
-+
+@@ -749,6 +750,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+         // CraftBukkit end
+         MinecraftServer.LOGGER.info("Stopping server");
+         MinecraftTimings.stopServer(); // Paper
 +        // Purpur start
 +        if (upnp) {
 +            if (com.dosse.upnp.UPnP.closePortTCP(getPort())) {
@@ -103,10 +102,9 @@ index 69970e0ab9..fab3e3d784 100644
 +            }
 +        }
 +        // Purpur end
-+
-         System.exit(0); // Paper
-     }
- 
+         // CraftBukkit start
+         if (this.server != null) {
+             this.server.disablePlugins();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index 16f5c9d372..c4ec515557 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java