Upstream tacos

Spigot-Server-Patches/0005-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 63ab9112d936ab7a127b13225c325c527d899536 Mon Sep 17 00:00:00 2001
+From 144a0f6da4e59e11511965e09bd19ac98f5f36ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -465,7 +465,7 @@ index 5432e70..72cd51a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8cea6b5..455357b 100644
+index 2aee2be..736800a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -50,7 +50,7 @@ import org.apache.logging.log4j.Logger;
@@ -477,7 +477,7 @@ index 8cea6b5..455357b 100644
  
  public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics {
  
-@@ -454,6 +454,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -455,6 +455,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
@@ -485,7 +485,7 @@ index 8cea6b5..455357b 100644
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -658,7 +659,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -659,7 +660,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      public void B() {}
  
      protected void C() throws ExceptionWorldConflict { // CraftBukkit - added throws
@@ -494,7 +494,7 @@ index 8cea6b5..455357b 100644
          long i = System.nanoTime();
  
          ++this.ticks;
-@@ -685,7 +686,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -686,7 +687,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -503,7 +503,7 @@ index 8cea6b5..455357b 100644
              this.methodProfiler.a("save");
              this.v.savePlayers();
              // Spigot Start
-@@ -700,7 +701,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -701,7 +702,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              // this.saveChunks(true);
              // Spigot End
              this.methodProfiler.b();
@@ -512,7 +512,7 @@ index 8cea6b5..455357b 100644
          }
  
          this.methodProfiler.a("tallying");
-@@ -717,12 +718,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -718,12 +719,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
@@ -528,7 +528,7 @@ index 8cea6b5..455357b 100644
          this.methodProfiler.a("jobs");
          Queue queue = this.j;
  
-@@ -733,26 +735,27 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -734,26 +736,27 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              SystemUtils.a(entry, MinecraftServer.LOGGER);
           }
          // Spigot end
@@ -563,7 +563,7 @@ index 8cea6b5..455357b 100644
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.ticks % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -760,7 +763,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -761,7 +764,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
              }
          }
@@ -572,7 +572,7 @@ index 8cea6b5..455357b 100644
  
          int i;
  
-@@ -817,9 +820,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -818,9 +821,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
                  this.methodProfiler.b();
                  this.methodProfiler.a("tracker");
@@ -582,7 +582,7 @@ index 8cea6b5..455357b 100644
                  this.methodProfiler.b();
                  this.methodProfiler.b();
              // } // CraftBukkit
-@@ -828,20 +829,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -829,20 +830,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          this.methodProfiler.c("connection");
@@ -710,7 +710,7 @@ index b0249ff..797a84f 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d1e2fdc..1a39ba3 100644
+index d5dd29b..13a6cfe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -965,7 +965,7 @@ index bcbb368..a691d8f 100644
                  this.methodProfiler.b();
                  this.U.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 39d60e4..218d5db 100644
+index 1ef30a3..c880d85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1726,6 +1726,7 @@ public final class CraftServer implements Server {
@@ -1181,7 +1181,7 @@ index 41d2d87..0000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 003fd2f..6b3bbfe 100644
+index ffc25bc..8cb9a7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;

Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -1,4 +1,4 @@
-From 2e8740a172aac1f963cf64634f6af7c49a5e21bb Mon Sep 17 00:00:00 2001
+From e73cfba0ec91cf2bc7c8f9bca1e3205c652a68b3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -20,10 +20,10 @@ index a8b5079..ebbc1fc 100644
              EULA.a.warn("Failed to save {}", new Object[] { this.b, exception});
          } finally {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6ec5eae..ed44a2a 100644
+index 736800a..fab855c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1035,7 +1035,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1036,7 +1036,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
  
      public String getServerModName() {
@@ -33,7 +33,7 @@ index 6ec5eae..ed44a2a 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 218d5db..d3db0a8 100644
+index c880d85..34daa73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -131,7 +131,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch

@@ -1,4 +1,4 @@
-From 0951c28931bdeff177c9b9506f18503f647ff8ce Mon Sep 17 00:00:00 2001
+From 1f95abb8e7716c606dfdb71a97e94808cc2fc238 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ed44a2a..ef0e063 100644
+index fab855c..31d2a10 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -114,17 +114,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -34,7 +34,7 @@ index ed44a2a..ef0e063 100644
  
      public MinecraftServer(OptionSet options, Proxy proxy, DataConverterManager dataconvertermanager, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
          io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
-@@ -528,12 +522,54 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -529,12 +523,54 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.isRunning = false;
      }
  
@@ -94,7 +94,7 @@ index ed44a2a..ef0e063 100644
   
      public void run() {
          try {
-@@ -547,24 +583,41 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -548,24 +584,41 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
                  // Spigot start
                  Arrays.fill( recentTps, 20 );
@@ -148,7 +148,7 @@ index ed44a2a..ef0e063 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d3db0a8..408ef34 100644
+index 34daa73..c3eb23e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1723,6 +1723,17 @@ public final class CraftServer implements Server {
@@ -211,5 +211,5 @@ index be2e31d..6d21c32 100644
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0031-Lighting-Queue.patch

@@ -1,4 +1,4 @@
-From 0084d13fb4191ad8c27f46e73e9ea43003b7fd5b Mon Sep 17 00:00:00 2001
+From a852ab90e3a6ffc60f939d3848f65bc375bde8f7 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -97,10 +97,10 @@ index 2ee5c92..23dc778 100644
          // Update neighbor counts
          for (int x = -2; x < 3; x++) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ef0e063..71710b9 100644
+index 31d2a10..88f99e5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -713,7 +713,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -714,7 +714,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
      protected void C() throws ExceptionWorldConflict { // CraftBukkit - added throws
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
@@ -109,7 +109,7 @@ index ef0e063..71710b9 100644
  
          ++this.ticks;
          if (this.S) {
-@@ -773,6 +773,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -774,6 +774,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.methodProfiler.b();
  
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -222,7 +222,7 @@ index 0000000..2350fe3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 746438f..bcc5ed4 100644
+index 8fb8176..672167a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -384,7 +384,7 @@ public abstract class World implements IBlockAccess {

Spigot-Server-Patches/0036-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From fa9528ce47a36f59234986ccad38a75a92afb084 Mon Sep 17 00:00:00 2001
+From 2f20d12e65e7e480ff9635d146f611746a9d11c5 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -124,10 +124,10 @@ index f4765d3..caf29c7 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 71710b9..2fc7479 100644
+index 88f99e5..afdce00 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -877,6 +877,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -878,6 +878,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  worldserver.getTracker().updatePlayers();
                  this.methodProfiler.b();
                  this.methodProfiler.b();
@@ -136,7 +136,7 @@ index 71710b9..2fc7479 100644
  
              // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3aea2af..f2c3409 100644
+index 672167a..e8cfe2b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -16,6 +16,7 @@ import javax.annotation.Nullable;
@@ -156,5 +156,5 @@ index 3aea2af..f2c3409 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch

@@ -1,4 +1,4 @@
-From bdde6e7c2dab8051003b8d07d52321d9ffab7452 Mon Sep 17 00:00:00 2001
+From c8890627ca3af598f072d84bbb7aad3540c5fb38 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@@ -20,10 +20,10 @@ index b302cb7..75e7b78 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2fc7479..4b60fed 100644
+index afdce00..a441b80 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1163,7 +1163,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1164,7 +1164,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              return arraylist;
          }
          */
@@ -33,7 +33,7 @@ index 2fc7479..4b60fed 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 541b8d8..73f5ea0 100644
+index e83a422..eb1dc5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -25,17 +25,11 @@ import javax.imageio.ImageIO;

Spigot-Server-Patches/0064-Ensure-inv-drag-is-in-bounds.patch

@@ -1,14 +1,14 @@
-From a8a92b91cd28ea0a4115976ff0a8daabf36abf9a Mon Sep 17 00:00:00 2001
+From 10427e51ebb1dbd175da88010c0ba5cc0cf509e5 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
-index 00f035a..a1368a0 100644
+index 23af626..97da4c0 100644
 --- a/src/main/java/net/minecraft/server/Container.java
 +++ b/src/main/java/net/minecraft/server/Container.java
-@@ -142,7 +142,7 @@ public abstract class Container {
+@@ -141,7 +141,7 @@ public abstract class Container {
                      this.d();
                  }
              } else if (this.g == 1) {

Spigot-Server-Patches/0112-Add-getEntity-by-UUID-API.patch

@@ -1,14 +1,14 @@
-From 40c2809484e385f980422a51dceb91e97b840b4c Mon Sep 17 00:00:00 2001
+From 7c894ae97ba5f7e12014d7a4d9aeec71bc503a14 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4b60fed..64868c0 100644
+index a441b80..d0aeec2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1513,6 +1513,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1514,6 +1514,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.Y = 0L;
      }
  
@@ -16,7 +16,7 @@ index 4b60fed..64868c0 100644
      @Nullable
      public Entity a(UUID uuid) {
          WorldServer[] aworldserver = this.worldServer;
-@@ -1526,7 +1527,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1527,7 +1528,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              if (worldserver != null) {
                  Entity entity = worldserver.getEntity(uuid);
  
@@ -26,7 +26,7 @@ index 4b60fed..64868c0 100644
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index de45d8b..5cb0eba 100644
+index 8f08fa5..91d00dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -46,6 +46,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;

Spigot-Server-Patches/0118-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From dd61ef81706c1b9568bca67fd4f0f2fa0b333086 Mon Sep 17 00:00:00 2001
+From bde87a70dfef5f3afd6fd58c60d86e8a17e29d49 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -21,10 +21,10 @@ index 2374419..d6fef83 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 62bbd14..cf5d86a 100644
+index d0aeec2..6ae3665 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -353,8 +353,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -354,8 +354,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              long j = av();
              i = 0;
  
@@ -52,7 +52,7 @@ index 1dc8af1..bb578d9 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5cb0eba..8202800 100644
+index 91d00dc..7f1caa8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -946,7 +946,7 @@ public final class CraftServer implements Server {
@@ -65,10 +65,10 @@ index 5cb0eba..8202800 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8cea8e5..f11d2f7 100644
+index 2606890..1994401 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1205,8 +1205,9 @@ public class CraftWorld implements World {
+@@ -1207,8 +1207,9 @@ public class CraftWorld implements World {
          int chunkCoordX = chunkcoordinates.getX() >> 4;
          int chunkCoordZ = chunkcoordinates.getZ() >> 4;
          // Cycle through the 25x25 Chunks around it to load/unload the chunks.

Spigot-Server-Patches/0141-remove-null-possibility-for-getServer-singleton.patch

@@ -1,4 +1,4 @@
-From 04bef9c46051bdfcb0a745a022be5defef1da644 Mon Sep 17 00:00:00 2001
+From 8d3ec2bb81e67c4a97606de1dbb78fc600fb147a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bfa6836..de67aca 100644
+index 6ae3665..0392042 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -54,6 +54,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -25,7 +25,7 @@ index bfa6836..de67aca 100644
          io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
          this.e = proxy;
          this.U = yggdrasilauthenticationservice;
-@@ -1602,7 +1604,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1603,7 +1605,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      // CraftBukkit start
      @Deprecated
      public static MinecraftServer getServer() {

Spigot-Server-Patches/0151-Optimize-UserCache-Thread-Safe.patch

@@ -1,4 +1,4 @@
-From cd24299884c8332c642d17def56fb348eea786fd Mon Sep 17 00:00:00 2001
+From be4a05986327340da70869849edc7c950329ebb9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index de67aca..e52b433 100644
+index 0392042..0f5502c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -504,7 +504,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -505,7 +505,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          // Spigot start
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              LOGGER.info("Saving usercache.json");

Spigot-Server-Patches/0161-Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -1,4 +1,4 @@
-From f47ee0562a94a603a3ed8a4e695f05941871c283 Mon Sep 17 00:00:00 2001
+From 4386477ab987b1a8eb91d3efcac70e53ca77833f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -129,10 +129,10 @@ index 6320247..9fed846 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f11d2f7..52d2865 100644
+index 1994401..f62878d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1489,7 +1489,7 @@ public class CraftWorld implements World {
+@@ -1491,7 +1491,7 @@ public class CraftWorld implements World {
          ChunkProviderServer cps = world.getChunkProviderServer();
          for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
              // If in use, skip it

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 287ef78890f06e95513c95793d401086f0484cc5
+Subproject commit 1faaa340e5d02ab0afdc5c9482ce7e5a5e74c1f7

work/Spigot

@@ -1 +1 @@
-Subproject commit 5391d732ffc9118bda74005a22e90efd749b3983
+Subproject commit 65a0f1170c38f06928cf916892ae863abecb6927