diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 2caae48ee6..ea75a36bf5 100644
--- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From 33b12a40ea76f7a137e9b45389338db460bf99b4 Mon Sep 17 00:00:00 2001
+From 0f60d848892041a4933419bdb4b7f01bc9b51ebd 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index b64cac2523..cc333de50b 100644
+index b64cac252..cc333de50 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
 @@ -49,13 +49,12 @@ public class EULA {
@@ -25,7 +25,7 @@ index b64cac2523..cc333de50b 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bb4d2cabfe..788f0519a8 100644
+index bb4d2cabf..788f0519a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1213,7 +1213,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -38,7 +38,7 @@ index bb4d2cabfe..788f0519a8 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 53033f0df1..273967c2ae 100644
+index 53033f0df..273967c2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -156,7 +156,7 @@ import org.bukkit.event.server.TabCompleteEvent;
@@ -51,11 +51,11 @@ index 53033f0df1..273967c2ae 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f1e8320034..f7a4d53ede 100644
+index e354245f7..bbd5766a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -200,7 +200,7 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -5);
+                     deadline.add(Calendar.DAY_OF_YEAR, -10);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");
 -                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***");
@@ -64,7 +64,7 @@ index f1e8320034..f7a4d53ede 100644
                          Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                      }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 94a3d4237d..91b8aa6a16 100644
+index 94a3d4237..91b8aa6a1 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
@@ -98,5 +98,5 @@ index 94a3d4237d..91b8aa6a16 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 8b55fc80ee..7c0e914b42 100644
--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 390de8da32a8dbc419498a9383b24f71f93a7c11 Mon Sep 17 00:00:00 2001
+From ef6db01e38c5b89e29bae002e4e8f980f301630e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5af6e0c973..b50bc5bf06 100644
+index 5af6e0c97..b50bc5bf0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -236,4 +236,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 5af6e0c973..b50bc5bf06 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bbd476bb0e..280e684db4 100644
+index abed6bb97..8056dc40d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -490,13 +490,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -63,7 +63,7 @@ index bbd476bb0e..280e684db4 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b8fcfb6092..411cfedd25 100644
+index b8fcfb609..411cfedd2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2881,8 +2881,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -78,7 +78,7 @@ index b8fcfb6092..411cfedd25 100644
  
      public LongSet ag() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d661f2e873..b1b541f990 100644
+index d661f2e87..b1b541f99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -998,7 +998,7 @@ public final class CraftServer implements Server {
@@ -91,10 +91,10 @@ index d661f2e873..b1b541f990 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 132b21f8bc..9637c98994 100644
+index ac44dfeef..50923951a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1274,8 +1274,9 @@ public class CraftWorld implements World {
+@@ -1275,8 +1275,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.
diff --git a/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 0acebbdb47..eed0277331 100644
--- a/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From e1715b19fc47bbad627dadce371634570c9f029b Mon Sep 17 00:00:00 2001
+From 01d56a7e10798f739aa8b3f292b93e9d4fddb12e 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
@@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f8102d9f07..547ab09627 100644
+index f8102d9f0..547ab0962 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -288,4 +288,18 @@ public class PaperWorldConfig {
@@ -40,7 +40,7 @@ index f8102d9f07..547ab09627 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 5390396d5e..3c9c3cd41d 100644
+index 5390396d5..3c9c3cd41 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -37,6 +37,7 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index 5390396d5e..3c9c3cd41d 100644
      public final int locZ;
      private boolean l;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b1e6901090..9739288b53 100644
+index b1e690109..9739288b5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -306,6 +306,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -76,7 +76,7 @@ index b1e6901090..9739288b53 100644
              this.chunkScheduler.a(booleansupplier);
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ac0e90eeca..3f4a8f21c0 100644
+index ac0e90eec..3f4a8f21c 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -33,8 +33,16 @@ public class PlayerChunk {
@@ -113,7 +113,7 @@ index ac0e90eeca..3f4a8f21c0 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a69d510dd1..7b67fa3208 100644
+index a69d510dd..7b67fa320 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -460,7 +460,13 @@ public class PlayerChunkMap {
@@ -132,7 +132,7 @@ index a69d510dd1..7b67fa3208 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 785f020652..d31101861c 100644
+index 785f02065..d31101861 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1342,7 +1342,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -151,10 +151,10 @@ index 785f020652..d31101861c 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9637c98994..6b3b45f94a 100644
+index 50923951a..8421c397a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1620,7 +1620,7 @@ public class CraftWorld implements World {
+@@ -1628,7 +1628,7 @@ public class CraftWorld implements World {
          ChunkProviderServer cps = world.getChunkProviderServer();
          for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
              // If in use, skip it
@@ -164,7 +164,7 @@ index 9637c98994..6b3b45f94a 100644
              }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 12040596df..f9bb19fed6 100644
+index 12040596d..f9bb19fed 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -284,6 +284,11 @@ public class ActivationRange
diff --git a/Spigot-Server-Patches/0166-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0166-Provide-E-TE-Chunk-count-stat-methods.patch
index 7f34d1f37b..a4b9afdc23 100644
--- a/Spigot-Server-Patches/0166-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0166-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 9c07ac68a080fbb4b9af90fde64a2f2902c7243c Mon Sep 17 00:00:00 2001
+From 463437d11f2ed0f45aa0d3faa206c6323b169122 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6b3b45f94a..f75a2e6be7 100644
+index 8421c397a..f39482696 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -81,6 +81,29 @@ public class CraftWorld implements World {
+@@ -82,6 +82,29 @@ public class CraftWorld implements World {
      private int chunkLoadCount = 0;
      private int chunkGCTickCount;
  
@@ -41,5 +41,5 @@ index 6b3b45f94a..f75a2e6be7 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
index 413865f2b2..f323c6126c 100644
--- a/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 48ae99005497fb58d8ed092c3e15d36f26593cec Mon Sep 17 00:00:00 2001
+From 94736b18aa282608640f0b08be6f947e1e9e5fef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,10 +7,10 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f75a2e6be7..5bfcedccc1 100644
+index f39482696..e05ad05a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -224,6 +224,7 @@ public class CraftWorld implements World {
+@@ -225,6 +225,7 @@ public class CraftWorld implements World {
      }
  
      private boolean unloadChunk0(int x, int z, boolean save) {
@@ -18,7 +18,7 @@ index f75a2e6be7..5bfcedccc1 100644
          net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z, false, false);
          if (chunk == null) {
              return true;
-@@ -231,6 +232,7 @@ public class CraftWorld implements World {
+@@ -232,6 +233,7 @@ public class CraftWorld implements World {
  
          // If chunk had previously been queued to save, must do save to avoid loss of that data
          return world.getChunkProviderServer().unloadChunk(chunk, chunk.mustSave || save);
@@ -27,5 +27,5 @@ index f75a2e6be7..5bfcedccc1 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index e96b2d87e8..100662bb6d 100644
--- a/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From e1de8e00ef96880a95e17dee22f3e1f1ad5ed3f5 Mon Sep 17 00:00:00 2001
+From 24977bb5b127d9c7c419933c30db4f8485ecf586 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 7818a3b6a7..d55b076f5d 100644
+index 7818a3b6a..d55b076f5 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -454,13 +454,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index 7818a3b6a7..d55b076f5d 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index b9afeaf72e..2c735a920d 100644
+index b9afeaf72..2c735a920 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index b9afeaf72e..2c735a920d 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 880f496526..31c8d4bc86 100644
+index 880f49652..31c8d4bc8 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@@ -120,7 +120,7 @@ index 880f496526..31c8d4bc86 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 81de03084a..4c92896ef8 100644
+index 81de03084..4c92896ef 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity {
@@ -133,7 +133,7 @@ index 81de03084a..4c92896ef8 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 60f22959b5..1b8763f618 100644
+index 91f831326..398ad151a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity {
@@ -147,7 +147,7 @@ index 60f22959b5..1b8763f618 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index a5e1939e05..e73dba09a6 100644
+index a5e1939e0..e73dba09a 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -160,7 +160,7 @@ index a5e1939e05..e73dba09a6 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 0227196f1e..8fe68c2eb4 100644
+index f03092f4d..e37fca5b1 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -411,7 +411,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -173,7 +173,7 @@ index 0227196f1e..8fe68c2eb4 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 4a128f707b..b870964674 100644
+index 4a128f707..b87096467 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -186,7 +186,7 @@ index 4a128f707b..b870964674 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 1bfa7e5e69..4e44180329 100644
+index 1bfa7e5e6..4e4418032 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -385,7 +385,7 @@ public class PlayerInteractManager {
@@ -199,7 +199,7 @@ index 1bfa7e5e69..4e44180329 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 22c47c63c7..52e296d468 100644
+index 22c47c63c..52e296d46 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -221,10 +221,10 @@ index 22c47c63c7..52e296d468 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5bfcedccc1..6347d3d1f2 100644
+index e05ad05a4..80941ab1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1209,7 +1209,7 @@ public class CraftWorld implements World {
+@@ -1210,7 +1210,7 @@ public class CraftWorld implements World {
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
              entity = new EntityTNTPrimed(world, x, y, z, null);
          } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@@ -234,7 +234,7 @@ index 5bfcedccc1..6347d3d1f2 100644
              // not sure what this can do
              if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3d4..3302af0e45 100644
+index 3a09cab3d..3302af0e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -257,5 +257,5 @@ index 3a09cab3d4..3302af0e45 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0199-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0199-Fix-this-stupid-bullshit.patch
index 65626db276..19f3cec178 100644
--- a/Spigot-Server-Patches/0199-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0199-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 52c0a75f307560e231c4370948c30fc1bf3c8849 Mon Sep 17 00:00:00 2001
+From 364af9d792a8aa71c82ac5957fb0640b44b6f3b4 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,12 +9,12 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 69a7c5205e..654f976a01 100644
+index 393a39fad..dd0c324ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -5);
+                     deadline.add(Calendar.DAY_OF_YEAR, -10);
                      if (buildDate.before(deadline.getTime())) {
 -                        System.err.println("*** Error, this build is outdated ***");
 +                        // Paper start - This is some stupid bullshit
@@ -29,5 +29,5 @@ index 69a7c5205e..654f976a01 100644
                  }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
index 09826c5e84..1b5572d24c 100644
--- a/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 961416ac0e026aaa7582b6f5ecae10364e97969d Mon Sep 17 00:00:00 2001
+From db72f56ffcdae6836f009ca24d307d0f8ca95fba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 65fe50882b..ee06457653 100644
+index 65fe50882..ee0645765 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1206,12 +1206,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -34,10 +34,10 @@ index 65fe50882b..ee06457653 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6347d3d1f2..63d9130918 100644
+index 80941ab1a..a7431110d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1616,11 +1616,17 @@ public class CraftWorld implements World {
+@@ -1617,11 +1617,17 @@ public class CraftWorld implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
diff --git a/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index a628125e47..c1dc4f25d0 100644
--- a/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 9534f2fa43867350aa82203cf3a9be73354ad17f Mon Sep 17 00:00:00 2001
+From 02b0e01668f75480a706f28a6fafe385cc4f745c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 63d9130918..c449a9a39b 100644
+index a7431110d..45bb22218 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -925,6 +925,10 @@ public class CraftWorld implements World {
+@@ -926,6 +926,10 @@ public class CraftWorld implements World {
          if (Boat.class.isAssignableFrom(clazz)) {
              entity = new EntityBoat(world, x, y, z);
              entity.setPositionRotation(x, y, z, yaw, pitch);
@@ -23,5 +23,5 @@ index 63d9130918..c449a9a39b 100644
              entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
          } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0278-Expand-Explosions-API.patch b/Spigot-Server-Patches/0278-Expand-Explosions-API.patch
index 8ec1abde05..fc7035c940 100644
--- a/Spigot-Server-Patches/0278-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0278-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From c9237095743ac1234dd75716082c6809783f83c2 Mon Sep 17 00:00:00 2001
+From 08b93d0e0074418124b2d05c5fcdb65387b9bc04 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c449a9a39b..b6589fdc68 100644
+index 45bb22218..a56459c81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -537,6 +537,11 @@ public class CraftWorld implements World {
+@@ -538,6 +538,11 @@ public class CraftWorld implements World {
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
          return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
      }
@@ -22,5 +22,5 @@ index c449a9a39b..b6589fdc68 100644
      public boolean createExplosion(Location loc, float power) {
          return createExplosion(loc, power, false);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
index 385ba3909f..1534e50bf3 100644
--- a/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
@@ -1,14 +1,14 @@
-From 9a07d4c94b4f9990316709bf12e84dedc3e8fc13 Mon Sep 17 00:00:00 2001
+From 14498ad26f17e0a00a013d79a3448cd9f9ac7a8d Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b6589fdc68..e4c4cdb980 100644
+index a56459c81..74f09ac45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -745,6 +745,14 @@ public class CraftWorld implements World {
+@@ -746,6 +746,14 @@ public class CraftWorld implements World {
          return list;
      }
  
@@ -24,5 +24,5 @@ index b6589fdc68..e4c4cdb980 100644
      // Spigot start
          save(true);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0300-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0300-Add-async-chunk-load-API.patch
index 1ccc3b1dec..ff0bd5ce10 100644
--- a/Spigot-Server-Patches/0300-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0300-Add-async-chunk-load-API.patch
@@ -1,14 +1,14 @@
-From 3787c26863d8c99bc691d42779ad2b414097f826 Mon Sep 17 00:00:00 2001
+From dbf563359289ee3bddce540d2ee7ef2b209711b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e4c4cdb980..c2aa3917bf 100644
+index 74f09ac45..0c83a070f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -156,6 +156,18 @@ public class CraftWorld implements World {
+@@ -157,6 +157,18 @@ public class CraftWorld implements World {
          }
      }
  
diff --git a/Spigot-Server-Patches/0314-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0314-Ignore-Dead-Entities-in-entityList-iteration.patch
index 4da98a8f10..82b1f31fa9 100644
--- a/Spigot-Server-Patches/0314-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0314-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 359e5d1b04b9e3e5f97e17d7bc778ab01bc5768e Mon Sep 17 00:00:00 2001
+From ec44d5b28d7c2c7810a846ef99da871b9ce244af Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 56700fc596..9b9c8361e9 100644
+index 56700fc59..9b9c8361e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index 56700fc596..9b9c8361e9 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8951ac8095..127a7c9b72 100644
+index 8951ac809..127a7c9b7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -123,6 +123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 8951ac8095..127a7c9b72 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 597169b4cc..b18ea7154f 100644
+index 597169b4c..b18ea7154 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1111,6 +1111,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -71,10 +71,10 @@ index 597169b4cc..b18ea7154f 100644
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c2aa3917bf..edf2e39e3d 100644
+index 0c83a070f..30ca72297 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -644,6 +644,7 @@ public class CraftWorld implements World {
+@@ -645,6 +645,7 @@ public class CraftWorld implements World {
          for (Object o : world.entityList) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -82,7 +82,7 @@ index c2aa3917bf..edf2e39e3d 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -662,6 +663,7 @@ public class CraftWorld implements World {
+@@ -663,6 +664,7 @@ public class CraftWorld implements World {
          for (Object o : world.entityList) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -90,7 +90,7 @@ index c2aa3917bf..edf2e39e3d 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -686,6 +688,7 @@ public class CraftWorld implements World {
+@@ -687,6 +689,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entityList) {
              if (entity instanceof net.minecraft.server.Entity) {
@@ -98,7 +98,7 @@ index c2aa3917bf..edf2e39e3d 100644
                  Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
  
                  if (bukkitEntity == null) {
-@@ -708,6 +711,7 @@ public class CraftWorld implements World {
+@@ -709,6 +712,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entityList) {
              if (entity instanceof net.minecraft.server.Entity) {
diff --git a/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch
index 17b7b8238b..7b38f0a21a 100644
--- a/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From 740216f5bc5bf37f2d525c217c986838b6c24559 Mon Sep 17 00:00:00 2001
+From d68d17ef949cfb143bfdddd42e196b7e7875ff4d Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6d511b6230..d8eb2e9864 100644
+index 6d511b623..d8eb2e986 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1201,8 +1201,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index 6d511b6230..d8eb2e9864 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
-index e26405d341..23f390c221 100644
+index e26405d34..23f390c22 100644
 --- a/src/main/java/net/minecraft/server/WorldManager.java
 +++ b/src/main/java/net/minecraft/server/WorldManager.java
 @@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@@ -95,7 +95,7 @@ index e26405d341..23f390c221 100644
              if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
                  double d0 = (double) blockposition.getX() - entityplayer.locX;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 911d03c70b..f837e6c36c 100644
+index 911d03c70..f837e6c36 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1086,7 +1086,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -119,10 +119,10 @@ index 911d03c70b..f837e6c36c 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index edf2e39e3d..2611971575 100644
+index 30ca72297..e6c2849a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1503,7 +1503,7 @@ public class CraftWorld implements World {
+@@ -1504,7 +1504,7 @@ public class CraftWorld implements World {
          double z = loc.getZ();
  
          PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);
diff --git a/Spigot-Server-Patches/0344-isChunkGenerated-API.patch b/Spigot-Server-Patches/0344-isChunkGenerated-API.patch
index 7ff2bd0a7e..d04b53f32b 100644
--- a/Spigot-Server-Patches/0344-isChunkGenerated-API.patch
+++ b/Spigot-Server-Patches/0344-isChunkGenerated-API.patch
@@ -1,4 +1,4 @@
-From b89f3bcbeb09fca84b3891892ea7d6ca4e96b5d1 Mon Sep 17 00:00:00 2001
+From 497ace0dc2f99a078b58dff5a1ebdb48db924d65 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:44:10 -0700
 Subject: [PATCH] isChunkGenerated API
@@ -6,7 +6,7 @@ Subject: [PATCH] isChunkGenerated API
 Resolves #1329
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 60f249a031..fc621911e0 100644
+index 60f249a03..fc621911e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -34,6 +34,9 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -20,10 +20,10 @@ index 60f249a031..fc621911e0 100644
      public final Long2ObjectMap<Chunk> chunks = Long2ObjectMaps.synchronize(new ChunkMap(8192));
      private Chunk lastChunk;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2611971575..99d8199996 100644
+index e6c2849a7..8572de4d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -596,6 +596,12 @@ public class CraftWorld implements World {
+@@ -597,6 +597,12 @@ public class CraftWorld implements World {
          return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
      }
  
diff --git a/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch b/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch
index c5d46bce07..2d2bff7f7c 100644
--- a/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch
+++ b/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch
@@ -1,11 +1,11 @@
-From 7a5dbc00ebc5103326157c6a22529554e6fca3a6 Mon Sep 17 00:00:00 2001
+From 5de827636c18a5bfbb11aa66625ab30da6e72a43 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Wed, 29 Aug 2018 00:37:42 -0400
 Subject: [PATCH] Implement Force-Loaded Chunk API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 650e605b5b..2ff8536d59 100644
+index 650e605b5..2ff8536d5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3023,6 +3023,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -17,7 +17,7 @@ index 650e605b5b..2ff8536d59 100644
          String s = "chunks";
          ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 12c6d850d2..55394e0c15 100644
+index 12c6d850d..55394e0c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -289,6 +289,18 @@ public class CraftChunk implements Chunk {
@@ -40,10 +40,10 @@ index 12c6d850d2..55394e0c15 100644
          Arrays.fill(emptySkyLight, (byte) 0xFF);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 99d8199996..f8ef782f14 100644
+index 8572de4d5..580e248f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -600,6 +600,10 @@ public class CraftWorld implements World {
+@@ -601,6 +601,10 @@ public class CraftWorld implements World {
      public boolean isChunkGenerated(int x, int z) {
          return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z);
      }
diff --git a/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch
index bd08399a92..1591db99fb 100644
--- a/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From ff9abbb55e424ee806cd9bf8305ad13bd4e9135e Mon Sep 17 00:00:00 2001
+From 1e8f3a642dfd5240ff160e1ed23e41db1e6f0ac7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
@@ -10,7 +10,7 @@ Will improve inlining across many hot methods.
 Improve getBrightness to not do double chunk map lookups.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index fc621911e0..99613b2ef3 100644
+index fc621911e..99613b2ef 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -381,7 +381,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -23,7 +23,7 @@ index fc621911e0..99613b2ef3 100644
                      neighbor.setNeighborUnloaded(-x, -z);
                      chunk.setNeighborUnloaded(x, z);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2ff8536d59..0c42d042b1 100644
+index 2ff8536d5..0c42d042b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -165,7 +165,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -55,10 +55,10 @@ index 2ff8536d59..0c42d042b1 100644
              return chunk != null && !chunk.isEmpty();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f8ef782f14..b411776c3c 100644
+index 580e248f8..6b46b97c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -218,7 +218,7 @@ public class CraftWorld implements World {
+@@ -219,7 +219,7 @@ public class CraftWorld implements World {
              return false;
          }
  
@@ -67,7 +67,7 @@ index f8ef782f14..b411776c3c 100644
          if (chunk != null) {
              world.getChunkProviderServer().unload(chunk);
          }
-@@ -237,7 +237,7 @@ public class CraftWorld implements World {
+@@ -238,7 +238,7 @@ public class CraftWorld implements World {
  
      private boolean unloadChunk0(int x, int z, boolean save) {
          Boolean result = MCUtil.ensureMain("Unload Chunk", () -> { // Paper - Ensure never async
diff --git a/work/Bukkit b/work/Bukkit
index cbb4fc1673..4db9e3dc04 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit cbb4fc1673f278d61b5238df15aa1a1fb69655cc
+Subproject commit 4db9e3dc04dc7f53b888d37733b680de86c1be84
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 8164f4b25b..65bb2d0f7d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8164f4b25bb557d4ded2db42ca4e6abb423bb5ee
+Subproject commit 65bb2d0f7d4d1581a11717784d8c6b6dc023fa91
diff --git a/work/Spigot b/work/Spigot
index 38536abd0c..68acb93f56 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 38536abd0c8dcb2ba30a344c53a92bc480d251ba
+Subproject commit 68acb93f56e6737f20a870264bd3e2c44efeed76