Update for upstream changes

Spigot-Server-Patches/Timings-v2.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 01:03:42 -0600
+Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
@@ -417,9 +417,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
 +        SpigotTimings.stopServer(); // Paper
-         if (this.am() != null) {
-             this.am().b();
-         }
+         // CraftBukkit start
+         if (this.server != null) {
+             this.server.disablePlugins();
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      protected void B() {}
  
@@ -555,8 +555,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static boolean haveWeSilencedAPhysicsCrash;
      public static String blockLocation;
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
-         this.N = worldprovider.getWorldBorder();
-         this.getServer().addWorld(this.world);  // CraftBukkit
+         this.getServer().addWorld(this.world);
+         // CraftBukkit end
          this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper
 -        timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
 +        timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings