diff --git a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch
index 08468cf9..58e89e57 100644
--- a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch
+++ b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From 6473f3030cef12e202803f086bc7dd02d50c9027 Mon Sep 17 00:00:00 2001
+From 791eac3175d798bb3269585f432a49d169411bf3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 15 May 2017 15:16:15 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -37,10 +37,10 @@ index 3eeaa571..ba0bdf1e 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e3968d5f..da775a6a 100644
+index 1deb7c09..6f2be5d3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2381,6 +2381,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2359,6 +2359,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
  
diff --git a/Bukkit-Patches/0010-Silenceable-Lightning-API.patch b/Bukkit-Patches/0010-Silenceable-Lightning-API.patch
index f5734aab..62d92bff 100644
--- a/Bukkit-Patches/0010-Silenceable-Lightning-API.patch
+++ b/Bukkit-Patches/0010-Silenceable-Lightning-API.patch
@@ -1,14 +1,14 @@
-From 0531862b60eb524d1c7e4c22ee2be32f7795366b Mon Sep 17 00:00:00 2001
+From 74b1d2e5efcd003e25ee2efb7bbd4dce60ac1529 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:29 -0400
 Subject: [PATCH] Silenceable Lightning API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index da775a6a..80752a2d 100644
+index 6f2be5d3..cd594d9d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2384,6 +2384,29 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2362,6 +2362,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      // Spigot start
      public class Spigot {
  
diff --git a/Bukkit-Patches/0015-View-Distance.patch b/Bukkit-Patches/0015-View-Distance.patch
index b93e5340..957a4b2a 100644
--- a/Bukkit-Patches/0015-View-Distance.patch
+++ b/Bukkit-Patches/0015-View-Distance.patch
@@ -1,4 +1,4 @@
-From a986bb2c6619e6c5ec52e38034c59d6ca3a9de89 Mon Sep 17 00:00:00 2001
+From a8edec8ea17ac883ce02c7ecfc469a15f45989ca Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 30 Jul 2019 13:47:34 -0700
 Subject: [PATCH] View Distance
@@ -6,10 +6,10 @@ Subject: [PATCH] View Distance
 This commit allows the retrieval of per world view distances.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 80752a2d..bc4417d8 100644
+index cd594d9d..2c0afc8e 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2381,6 +2381,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2359,6 +2359,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
  
diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
index 3844c3e9..0c5305a6 100644
--- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From d24673b5df8edcc2c13f5c57868627508ab090ee Mon Sep 17 00:00:00 2001
+From d74fc12f62d9a3d89211a6aba1d5f76cf6ac7eb5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3b0e63426..8f76b81b1 100644
+index 803873175..57b447096 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2117,4 +2117,16 @@ public final class CraftServer implements Server {
+@@ -2176,4 +2176,16 @@ public final class CraftServer implements Server {
      public UnsafeValues getUnsafe() {
          return CraftMagicNumbers.INSTANCE;
      }
@@ -27,10 +27,10 @@ index 3b0e63426..8f76b81b1 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c0225ec9c..05d8a187e 100644
+index 688df033e..194bb11bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2362,4 +2362,15 @@ public class CraftWorld implements World {
+@@ -1703,4 +1703,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public DragonBattle getEnderDragonBattle() {
          return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
      }
@@ -84,10 +84,10 @@ index 7fa2588b8..e0acbada8 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6fc198d70..9e4967004 100644
+index 04fea7c0b..ccb12067d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1070,4 +1070,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1075,4 +1075,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
          return perm;
      }
diff --git a/CraftBukkit-Patches/0003-Spigot-Configuration.patch b/CraftBukkit-Patches/0003-Spigot-Configuration.patch
index 5c75dd2b..aab5b194 100644
--- a/CraftBukkit-Patches/0003-Spigot-Configuration.patch
+++ b/CraftBukkit-Patches/0003-Spigot-Configuration.patch
@@ -1,4 +1,4 @@
-From a1c4bf1f7791edf776c2faeb8ae631d301c920a8 Mon Sep 17 00:00:00 2001
+From 551190a5982169079de5f093b33e649d2be33dcb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
@@ -31,7 +31,7 @@ index b730cde94..3dfd678cc 100644
          server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index 861ae9226..4aee8ca68 100644
+index 76a4decff..fda4c82bd 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -144,6 +144,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -45,16 +45,16 @@ index 861ae9226..4aee8ca68 100644
 @@ -158,6 +159,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      }
  
-     protected World(WorldDataMutable worlddatamutable, ResourceKey<World> resourcekey, final DimensionManager dimensionmanager, Supplier<GameProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
+     protected World(WorldDataMutable worlddatamutable, ResourceKey<World> resourcekey, final DimensionManager dimensionmanager, Supplier<GameProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) {
 +        this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.WorldDataServer) worlddatamutable).getName()); // Spigot
          this.generator = gen;
-         this.world = new CraftWorld((WorldServer) this, gen, env);
+         this.world = new CraftWorld((WorldServer) this, gen, biomeProvider, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8f76b81b1..bd4ec775e 100644
+index 57b447096..5b2e32252 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -794,6 +794,7 @@ public final class CraftServer implements Server {
+@@ -800,6 +800,7 @@ public final class CraftServer implements Server {
              logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
          }
  
@@ -62,7 +62,7 @@ index 8f76b81b1..bd4ec775e 100644
          for (WorldServer world : console.getWorlds()) {
              world.serverLevelData.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -826,11 +827,13 @@ public final class CraftServer implements Server {
+@@ -832,11 +833,13 @@ public final class CraftServer implements Server {
              } else {
                  world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
              }
@@ -77,7 +77,7 @@ index 8f76b81b1..bd4ec775e 100644
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ccda7c6a4..83c908cf1 100644
+index 455127f08..058de8c27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -121,6 +121,14 @@ public class Main {
diff --git a/CraftBukkit-Patches/0006-Async-Operation-Catching.patch b/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
index 520cb15c..662e1606 100644
--- a/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From a828f7dda11e5f186ed3b7e2bc7f012742da9f35 Mon Sep 17 00:00:00 2001
+From 0de833a7f6cbce5136547e6a7986a3e4deca6b65 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@@ -42,7 +42,7 @@ index 83dbdb987..87aa223a3 100644
                  Vec3D vec3d = entityplayer.getPositionVector().d(this.entity.getPositionVector()); // MC-155077, SPIGOT-5113
                  int i = Math.min(this.b(), (PlayerChunkMap.this.viewDistance - 1) * 16);
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index f299cbf90..3216150bf 100644
+index 3f8a0454e..54f8187a4 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -942,6 +942,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -121,10 +121,10 @@ index a8c5013a3..61767a794 100644
              world.removeTileEntity(blockposition);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bd4ec775e..1803614a0 100644
+index 5b2e32252..2d4d46f9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -745,6 +745,7 @@ public final class CraftServer implements Server {
+@@ -751,6 +751,7 @@ public final class CraftServer implements Server {
      public boolean dispatchCommand(CommandSender sender, String commandLine) {
          Validate.notNull(sender, "Sender cannot be null");
          Validate.notNull(commandLine, "CommandLine cannot be null");
@@ -133,10 +133,10 @@ index bd4ec775e..1803614a0 100644
          if (commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05d8a187e..fad5223a2 100644
+index 194bb11bb..93388d276 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -398,6 +398,7 @@ public class CraftWorld implements World {
+@@ -243,6 +243,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean unloadChunkRequest(int x, int z) {
@@ -144,7 +144,7 @@ index 05d8a187e..fad5223a2 100644
          if (isChunkLoaded(x, z)) {
              world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1, Unit.INSTANCE);
          }
-@@ -406,6 +407,7 @@ public class CraftWorld implements World {
+@@ -251,6 +252,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      }
  
      private boolean unloadChunk0(int x, int z, boolean save) {
@@ -152,7 +152,7 @@ index 05d8a187e..fad5223a2 100644
          if (!isChunkLoaded(x, z)) {
              return true;
          }
-@@ -420,6 +422,7 @@ public class CraftWorld implements World {
+@@ -265,6 +267,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean regenerateChunk(int x, int z) {
@@ -160,7 +160,7 @@ index 05d8a187e..fad5223a2 100644
          throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
          /*
          if (!unloadChunk0(x, z, false)) {
-@@ -471,6 +474,7 @@ public class CraftWorld implements World {
+@@ -316,6 +319,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
@@ -168,7 +168,7 @@ index 05d8a187e..fad5223a2 100644
          IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
  
          // If generate = false, but the chunk already exists, we will get this back.
-@@ -1102,6 +1106,7 @@ public class CraftWorld implements World {
+@@ -803,6 +807,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@@ -176,7 +176,7 @@ index 05d8a187e..fad5223a2 100644
          Validate.notNull(boundingBox, "Bounding box is null!");
  
          AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
-@@ -1256,6 +1261,7 @@ public class CraftWorld implements World {
+@@ -957,6 +962,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void save() {
@@ -185,17 +185,17 @@ index 05d8a187e..fad5223a2 100644
          boolean oldSave = world.noSave;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9e4967004..7c8b30fd2 100644
+index ccb12067d..3aa218e7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -530,6 +530,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
- 
+@@ -533,6 +533,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      @Override
      public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) {
+         Preconditions.checkState(!entity.generation, "Cannot get nearby entities during world generation");
 +        org.spigotmc.AsyncCatcher.catchOp("getNearbyEntities"); // Spigot
+ 
          List<Entity> notchEntityList = entity.level.getEntities(entity, entity.getBoundingBox().grow(x, y, z), Predicates.alwaysTrue());
          List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
- 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 748823e95..7ab4d4f32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
diff --git a/CraftBukkit-Patches/0007-View-Distance.patch b/CraftBukkit-Patches/0007-View-Distance.patch
index 7cc625b6..f58ae396 100644
--- a/CraftBukkit-Patches/0007-View-Distance.patch
+++ b/CraftBukkit-Patches/0007-View-Distance.patch
@@ -1,4 +1,4 @@
-From a32fc5cd7c080bf296d2f2902f0f92a320939b9f Mon Sep 17 00:00:00 2001
+From cb0b1c2534a61c90eee127e1f2f6e5336fbe8d5a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
@@ -6,7 +6,7 @@ Subject: [PATCH] View Distance
 This commit allows the user to select per world view distances.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 3216150bf..591093ba2 100644
+index 54f8187a4..56bc1f239 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -245,7 +245,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -41,10 +41,10 @@ index 38dd1ca4d..c83afc3d0 100644
          entityplayer1.unsetRemoved();
          entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fad5223a2..088babd9d 100644
+index 93388d276..0c032de95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2369,6 +2369,13 @@ public class CraftWorld implements World {
+@@ -1710,6 +1710,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
      }
  
diff --git a/CraftBukkit-Patches/0008-Spigot-Timings.patch b/CraftBukkit-Patches/0008-Spigot-Timings.patch
index 1681974b..0c563998 100644
--- a/CraftBukkit-Patches/0008-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0008-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From 3cdaa1d0fb434fa1b604332c0229b495aeef0fdc Mon Sep 17 00:00:00 2001
+From 56037dbd8dc3cbc4dc2fc2d24add67fbcc059221 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -6,10 +6,10 @@ Subject: [PATCH] Spigot Timings
 Overhauls the Timings System adding performance tracking all around the Minecraft Server
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1c7eada62..9dc6c12ac 100644
+index 5ac6dad62..3690f1b3b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -182,6 +182,8 @@ import org.bukkit.craftbukkit.Main;
+@@ -184,6 +184,8 @@ import org.bukkit.craftbukkit.generator.CustomWorldChunkManager;
  import org.bukkit.event.server.ServerLoadEvent;
  // CraftBukkit end
  
@@ -18,7 +18,7 @@ index 1c7eada62..9dc6c12ac 100644
  public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable {
  
      public static final Logger LOGGER = LogManager.getLogger();
-@@ -1151,6 +1153,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1166,6 +1168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public void exit() {}
  
      public void a(BooleanSupplier booleansupplier) {
@@ -26,7 +26,7 @@ index 1c7eada62..9dc6c12ac 100644
          long i = SystemUtils.getMonotonicNanos();
  
          ++this.tickCount;
-@@ -1170,12 +1173,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1185,12 +1188,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          if (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0) { // CraftBukkit
@@ -41,7 +41,7 @@ index 1c7eada62..9dc6c12ac 100644
          }
  
          this.profiler.enter("snooper");
-@@ -1196,21 +1201,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1211,21 +1216,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
          this.frameTimer.a(i1 - i);
          this.profiler.exit();
@@ -72,7 +72,7 @@ index 1c7eada62..9dc6c12ac 100644
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.tickCount % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -1218,6 +1232,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1233,6 +1247,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  entityplayer.connection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.level.getTime(), entityplayer.getPlayerTime(), entityplayer.level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
              }
          }
@@ -80,7 +80,7 @@ index 1c7eada62..9dc6c12ac 100644
  
          while (iterator.hasNext()) {
              WorldServer worldserver = (WorldServer) iterator.next();
-@@ -1236,7 +1251,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1251,7 +1266,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.profiler.enter("tick");
  
              try {
@@ -90,7 +90,7 @@ index 1c7eada62..9dc6c12ac 100644
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.a(throwable, "Exception ticking world");
  
-@@ -1249,18 +1266,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1264,18 +1281,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          this.profiler.exitEnter("connection");
@@ -199,7 +199,7 @@ index ff52bc504..99e5bd084 100644
  
      private void a(long i, Consumer<Chunk> consumer) {
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 591093ba2..ccdeaab96 100644
+index 56bc1f239..08942de16 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -157,6 +157,7 @@ import net.minecraft.world.entity.monster.EntityDrowned;
@@ -318,7 +318,7 @@ index 0ea011a88..87c89e054 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 95a2a34c7..30c17ea6c 100644
+index 06da921f4..a55d8b1fd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -126,6 +126,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@@ -329,7 +329,7 @@ index 95a2a34c7..30c17ea6c 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -280,6 +281,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -281,6 +282,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
      public boolean persistentInvisibility = false;
@@ -337,7 +337,7 @@ index 95a2a34c7..30c17ea6c 100644
  
      public float getBukkitYaw() {
          return this.yRot;
-@@ -700,6 +702,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -701,6 +703,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -345,7 +345,7 @@ index 95a2a34c7..30c17ea6c 100644
          if (this.noPhysics) {
              this.setPosition(this.locX() + vec3d.x, this.locY() + vec3d.y, this.locZ() + vec3d.z);
          } else {
-@@ -846,6 +849,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -847,6 +850,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
                  this.level.getMethodProfiler().exit();
              }
          }
@@ -449,7 +449,7 @@ index 97676812c..f7c01d8a2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index 4aee8ca68..c198192ed 100644
+index fda4c82bd..d63228b3e 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -82,6 +82,7 @@ import org.bukkit.Bukkit;
@@ -579,10 +579,10 @@ index 43eaab115..df5c31646 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1803614a0..d1680c5b1 100644
+index 2d4d46f9f..ebb6b8843 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2126,6 +2126,11 @@ public final class CraftServer implements Server {
+@@ -2185,6 +2185,11 @@ public final class CraftServer implements Server {
      private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
      {
  
diff --git a/CraftBukkit-Patches/0012-Entity-Activation-Range.patch b/CraftBukkit-Patches/0012-Entity-Activation-Range.patch
index 0c29815c..c976b490 100644
--- a/CraftBukkit-Patches/0012-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0012-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From f8608502a38bf27e4fb9ecb5a90ae5cc07e52d70 Mon Sep 17 00:00:00 2001
+From b363eeca4dc2e72dcbaddfb765181cad567ffb4a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index ccdeaab96..998f619a1 100644
+index 08942de16..39428a608 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -465,6 +465,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -35,10 +35,10 @@ index ccdeaab96..998f619a1 100644
          entity.aZ();
          GameProfilerFiller gameprofilerfiller = this.getMethodProfiler();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3673d8418..3f7e91c16 100644
+index a55d8b1fd..250bebecb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -282,6 +282,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -283,6 +283,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
      public boolean forceExplosionKnockback; // SPIGOT-949
      public boolean persistentInvisibility = false;
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@@ -51,7 +51,7 @@ index 3673d8418..3f7e91c16 100644
  
      public float getBukkitYaw() {
          return this.yRot;
-@@ -314,6 +320,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -315,6 +321,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
          this.position = Vec3D.ZERO;
          this.blockPosition = BlockPosition.ZERO;
          this.packetCoordinates = Vec3D.ZERO;
diff --git a/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch
index 2a55b00e..171d0f7b 100644
--- a/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,4 +1,4 @@
-From 7018aeec50b908d7a06674655a75d7faeeaf5827 Mon Sep 17 00:00:00 2001
+From 365278ba7b491ce16ff2d051c81353a0c3913dfa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
@@ -25,10 +25,10 @@ index e159f7e82..b5de9459b 100644
              if (commandnode2.canUse(commandlistenerwrapper)) {
                  ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d1680c5b1..1ccddfba4 100644
+index ebb6b8843..a81167b7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1815,6 +1815,13 @@ public final class CraftServer implements Server {
+@@ -1874,6 +1874,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {
diff --git a/CraftBukkit-Patches/0019-Configurable-Messages.patch b/CraftBukkit-Patches/0019-Configurable-Messages.patch
index f1489f0f..5170b74b 100644
--- a/CraftBukkit-Patches/0019-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0019-Configurable-Messages.patch
@@ -1,4 +1,4 @@
-From 84d73928aff4c52eb55be711929728f0af7ccb36 Mon Sep 17 00:00:00 2001
+From 87ec03ba7b7f250f4223ad71a3b456cbc54e3496 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -43,10 +43,10 @@ index c83afc3d0..d199fde5b 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1ccddfba4..6b5007b3d 100644
+index a81167b7f..48b1bc696 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -751,11 +751,11 @@ public final class CraftServer implements Server {
+@@ -757,11 +757,11 @@ public final class CraftServer implements Server {
              return true;
          }
  
diff --git a/CraftBukkit-Patches/0022-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0022-Entity-Mount-and-Dismount-Events.patch
index 72813451..c954f371 100644
--- a/CraftBukkit-Patches/0022-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0022-Entity-Mount-and-Dismount-Events.patch
@@ -1,14 +1,14 @@
-From f64c95d1b0c3a802301613e7170b00f3b383ae8b Mon Sep 17 00:00:00 2001
+From 3dbe3e6bf1b69e38be86946059ec15a9b3f2b26a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 27 Feb 2016 10:07:58 +1100
 Subject: [PATCH] Entity Mount and Dismount Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3f7e91c16..45143c404 100644
+index 250bebecb..91b3a67e8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2184,6 +2184,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -2185,6 +2185,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
                  }
              }
              // CraftBukkit end
@@ -25,7 +25,7 @@ index 3f7e91c16..45143c404 100644
              if (this.passengers.isEmpty()) {
                  this.passengers = ImmutableList.of(entity);
              } else {
-@@ -2225,6 +2235,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -2226,6 +2236,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
                  }
              }
              // CraftBukkit end
diff --git a/CraftBukkit-Patches/0025-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0025-Fully-Disable-Snooper-When-Not-Required.patch
index 1cdaf7f3..a1793a63 100644
--- a/CraftBukkit-Patches/0025-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0025-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,14 +1,14 @@
-From cfc3a21320c6a9e87cf58a486da151978ffb57c4 Mon Sep 17 00:00:00 2001
+From 7c8b6e0b166b4c1c8a5a32b7ce538ef94a2cf7a6 Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9dc6c12ac..e6fc3b5a6 100644
+index 3690f1b3b..6f134c6ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1184,11 +1184,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1199,11 +1199,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          this.profiler.enter("snooper");
diff --git a/CraftBukkit-Patches/0029-Watchdog-Thread.patch b/CraftBukkit-Patches/0029-Watchdog-Thread.patch
index 62b815de..bdd500c1 100644
--- a/CraftBukkit-Patches/0029-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0029-Watchdog-Thread.patch
@@ -1,14 +1,14 @@
-From 57817891a80d17d037dd8d521f2673f5caa0fc93 Mon Sep 17 00:00:00 2001
+From 5aa46ee6c171b4d543baa85d78fec777fc069e97 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e6fc3b5a6..da903620e 100644
+index 6f134c6ad..8f3102178 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1040,6 +1040,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1055,6 +1055,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              } catch (Throwable throwable1) {
                  MinecraftServer.LOGGER.error("Exception stopping the server", throwable1);
              } finally {
@@ -16,7 +16,7 @@ index e6fc3b5a6..da903620e 100644
                  // CraftBukkit start - Restore terminal to original settings
                  try {
                      reader.getTerminal().restore();
-@@ -1201,6 +1202,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1216,6 +1217,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
          this.frameTimer.a(i1 - i);
          this.profiler.exit();
@@ -38,10 +38,10 @@ index afcd2e499..e6e54bd0e 100644
  
                  thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6b5007b3d..454f64b95 100644
+index 48b1bc696..97d2d1bcc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1782,7 +1782,7 @@ public final class CraftServer implements Server {
+@@ -1841,7 +1841,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -50,7 +50,7 @@ index 6b5007b3d..454f64b95 100644
      }
  
      @Override
-@@ -2138,6 +2138,11 @@ public final class CraftServer implements Server {
+@@ -2197,6 +2197,11 @@ public final class CraftServer implements Server {
          {
              return org.spigotmc.SpigotConfig.config;
          }
diff --git a/CraftBukkit-Patches/0032-BungeeCord-Support.patch b/CraftBukkit-Patches/0032-BungeeCord-Support.patch
index 534afdcc..7de5c886 100644
--- a/CraftBukkit-Patches/0032-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0032-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 6db13b224fb82cfceeec0cf5c58b7499f8326240 Mon Sep 17 00:00:00 2001
+From 1118a3cba15a079de62870dcb46347fd9a271def Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -133,10 +133,10 @@ index 01b69a1d9..f3c3b7d07 100644
          if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
              GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 454f64b95..79c5ecad3 100644
+index 97d2d1bcc..3b28f738f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -668,7 +668,13 @@ public final class CraftServer implements Server {
+@@ -674,7 +674,13 @@ public final class CraftServer implements Server {
  
      @Override
      public long getConnectionThrottle() {
diff --git a/CraftBukkit-Patches/0034-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0034-Configurable-Amount-of-Netty-Threads.patch
index 7ea74bd6..335963aa 100644
--- a/CraftBukkit-Patches/0034-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0034-Configurable-Amount-of-Netty-Threads.patch
@@ -1,4 +1,4 @@
-From 25a52ce0dc08a51f559ba4e9390b25c15ffbfeb6 Mon Sep 17 00:00:00 2001
+From af7ccba0bc01cd9af0ff3f06e2978dec76bd60f3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Amount of Netty Threads
 This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index da903620e..d66a91529 100644
+index 8f3102178..35095a8aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -338,7 +338,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -340,7 +340,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              usercache.a((Executor) this);
          }
  
@@ -18,7 +18,7 @@ index da903620e..d66a91529 100644
          this.progressListenerFactory = worldloadlistenerfactory;
          this.storageSource = convertable_conversionsession;
          this.playerDataStorage = convertable_conversionsession.b();
-@@ -1610,7 +1610,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1625,7 +1625,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Nullable
      public ServerConnection getServerConnection() {
diff --git a/CraftBukkit-Patches/0035-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0035-Log-Cause-of-Unexpected-Exceptions.patch
index 558e1427..64fdcacb 100644
--- a/CraftBukkit-Patches/0035-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0035-Log-Cause-of-Unexpected-Exceptions.patch
@@ -1,14 +1,14 @@
-From fc293059b6772f7c01b743028a7a4d1c83bdb6a1 Mon Sep 17 00:00:00 2001
+From 5fb5deb1dedb45d1f137a97d0049be53fb40e9f1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d66a91529..29115869b 100644
+index 35095a8aa..8a6518b8d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1012,6 +1012,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1027,6 +1027,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              }
          } catch (Throwable throwable) {
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
diff --git a/CraftBukkit-Patches/0036-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0036-Save-ticks-lived-to-nbttag.patch
index c66f1cc5..272bfd3f 100644
--- a/CraftBukkit-Patches/0036-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0036-Save-ticks-lived-to-nbttag.patch
@@ -1,14 +1,14 @@
-From 1a0534a246f8ea765fb4cc19b11e9439e1661f87 Mon Sep 17 00:00:00 2001
+From 7f50739cbb134577ab143d133abce9c46a9ecbf3 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 45143c404..82378e643 100644
+index 91b3a67e8..e3a739448 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1740,6 +1740,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -1741,6 +1741,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
              if (this.persistentInvisibility) {
                  nbttagcompound.setBoolean("Bukkit.invisible", this.persistentInvisibility);
              }
@@ -16,7 +16,7 @@ index 45143c404..82378e643 100644
              // CraftBukkit end
              IChatBaseComponent ichatbasecomponent = this.getCustomName();
  
-@@ -1899,6 +1900,8 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -1900,6 +1901,8 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
              if (this instanceof EntityLiving) {
                  EntityLiving entity = (EntityLiving) this;
  
diff --git a/CraftBukkit-Patches/0040-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0040-Try-and-Debug-Crash-Reports-Crashing.patch
index 579bd102..ebb16172 100644
--- a/CraftBukkit-Patches/0040-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0040-Try-and-Debug-Crash-Reports-Crashing.patch
@@ -1,14 +1,14 @@
-From 30d4405189009647a26319aaf35c3f2ab2df1a20 Mon Sep 17 00:00:00 2001
+From 11b54ce21a94e24980d52d5e582063ec6253500b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 29115869b..de8da6de0 100644
+index 8a6518b8d..0de0ea9c7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1263,7 +1263,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1278,7 +1278,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  worldserver.doTick(booleansupplier);
                  worldserver.timings.doTick.stopTiming(); // Spigot
              } catch (Throwable throwable) {
diff --git a/CraftBukkit-Patches/0043-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0043-Highly-Optimized-Tick-Loop.patch
index 352e3266..8359865e 100644
--- a/CraftBukkit-Patches/0043-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0043-Highly-Optimized-Tick-Loop.patch
@@ -1,14 +1,14 @@
-From 743f9db049a31020f67ed6ad942431a5b3d92de7 Mon Sep 17 00:00:00 2001
+From 78094419fc9f2ba7c9921a56d602e711dee15000 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 26 Jan 2017 21:50:51 +0000
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index de8da6de0..91f274832 100644
+index 0de0ea9c7..39965fd63 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -288,6 +288,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -290,6 +290,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public CommandDispatcher vanillaCommandDispatcher;
      private boolean forceTicks;
      // CraftBukkit end
@@ -21,7 +21,7 @@ index de8da6de0..91f274832 100644
  
      public static <S extends MinecraftServer> S a(Function<Thread, S> function) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -969,6 +975,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -984,6 +990,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      }
  
@@ -35,7 +35,7 @@ index de8da6de0..91f274832 100644
      protected void x() {
          try {
              if (this.init()) {
-@@ -977,8 +990,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -992,8 +1005,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  this.status.setServerInfo(new ServerPing.ServerData(SharedConstants.getGameVersion().getName(), SharedConstants.getGameVersion().getProtocolVersion()));
                  this.a(this.status);
  
@@ -48,7 +48,7 @@ index de8da6de0..91f274832 100644
  
                      if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
                          long j = i / 50L;
-@@ -989,6 +1005,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1004,6 +1020,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          this.lastOverloadWarning = this.nextTickTime;
                      }
  
diff --git a/CraftBukkit-Patches/0049-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0049-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
index 550efcb7..ef251857 100644
--- a/CraftBukkit-Patches/0049-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
+++ b/CraftBukkit-Patches/0049-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
@@ -1,14 +1,14 @@
-From 9844469c03f12e7f542f534298cd404cfaf35b96 Mon Sep 17 00:00:00 2001
+From bc2a874536a9a15acc4b3338ba7b2b791785a7a2 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 79c5ecad3..1a907767f 100644
+index 3b28f738f..8b87bf160 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -419,8 +419,11 @@ public final class CraftServer implements Server {
+@@ -425,8 +425,11 @@ public final class CraftServer implements Server {
          }
  
          if (type == PluginLoadOrder.POSTWORLD) {
@@ -21,7 +21,7 @@ index 79c5ecad3..1a907767f 100644
              commandMap.registerServerAliases();
              DefaultPermissions.registerCorePermissions();
              CraftDefaultPermissions.registerCorePermissions();
-@@ -434,12 +437,21 @@ public final class CraftServer implements Server {
+@@ -440,12 +443,21 @@ public final class CraftServer implements Server {
          pluginManager.disablePlugins();
      }
  
diff --git a/CraftBukkit-Patches/0050-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0050-Implement-Silenceable-Lightning-API.patch
index c70952de..2fc4b0bb 100644
--- a/CraftBukkit-Patches/0050-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0050-Implement-Silenceable-Lightning-API.patch
@@ -1,4 +1,4 @@
-From 677aebc0a8a067e52eb6734e8622f1d8a8b2a030 Mon Sep 17 00:00:00 2001
+From 6bff073e1109c6839f894eb5859b1503c047af2e Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
@@ -26,10 +26,10 @@ index d96d92c81..c4d74bede 100644
                  this.level.a(this.locX(), this.locY(), this.locZ(), SoundEffects.LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F, false);
                  this.level.a(this.locX(), this.locY(), this.locZ(), SoundEffects.LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F, false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 088babd9d..d79561cc2 100644
+index 0c032de95..77be9b6df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2379,6 +2379,26 @@ public class CraftWorld implements World {
+@@ -1720,6 +1720,26 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
      {
diff --git a/CraftBukkit-Patches/0054-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0054-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
index fb7c48cc..b3a0b9e3 100644
--- a/CraftBukkit-Patches/0054-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
+++ b/CraftBukkit-Patches/0054-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
@@ -1,4 +1,4 @@
-From 6c5aa5783c1fd354a16a0960394cfcbeebfc8964 Mon Sep 17 00:00:00 2001
+From d0f063daa1a72aa2416b6c64402b5e771372ea49 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 11 Apr 2014 11:16:34 +0100
 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@@ -6,10 +6,10 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 91f274832..01aadb81d 100644
+index 39965fd63..4e23538d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1384,7 +1384,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1399,7 +1399,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/CraftBukkit-Patches/0065-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0065-Configurable-save-on-stop-only-for-UserCache.patch
index a7623928..2c842e90 100644
--- a/CraftBukkit-Patches/0065-Configurable-save-on-stop-only-for-UserCache.patch
+++ b/CraftBukkit-Patches/0065-Configurable-save-on-stop-only-for-UserCache.patch
@@ -1,14 +1,14 @@
-From 5b2f70f6f950b2bcb07c06c1ed8d3a77ff900903 Mon Sep 17 00:00:00 2001
+From 3abf14d11401a22831f7cecdbeabd821b17e4ee3 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 23 May 2014 18:05:10 -0400
 Subject: [PATCH] Configurable save-on-stop-only for UserCache
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 01aadb81d..c96775266 100644
+index 4e23538d2..e6219e027 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -948,6 +948,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -963,6 +963,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          } catch (IOException ioexception1) {
              MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelName(), ioexception1);
          }
diff --git a/CraftBukkit-Patches/0068-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0068-Further-Seed-Customisation.patch
index 44d68c59..fff17464 100644
--- a/CraftBukkit-Patches/0068-Further-Seed-Customisation.patch
+++ b/CraftBukkit-Patches/0068-Further-Seed-Customisation.patch
@@ -1,4 +1,4 @@
-From 6f44c14a796203a2939994aebed438941b1f24b5 Mon Sep 17 00:00:00 2001
+From 3773bd28b65dd9492e371642f127da463273a46b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 4 Jul 2014 13:28:45 +1000
 Subject: [PATCH] Further Seed Customisation
@@ -34,7 +34,7 @@ index 961b9e17d..7ffe8eae6 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 11145a549..f9acbe5af 100644
+index 53075620a..427908207 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -211,6 +211,7 @@ public abstract class ChunkGenerator {
@@ -45,7 +45,7 @@ index 11145a549..f9acbe5af 100644
              StructureSettingsFeature structuresettingsfeature = this.settings.a(structuregenerator);
  
              return structuresettingsfeature == null ? null : structuregenerator.getNearestGeneratedFeature(worldserver, worldserver.getStructureManager(), blockposition, i, flag, worldserver.getSeed(), structuresettingsfeature);
-@@ -288,6 +289,7 @@ public abstract class ChunkGenerator {
+@@ -325,6 +326,7 @@ public abstract class ChunkGenerator {
          SectionPosition sectionposition = SectionPosition.a(ichunkaccess);
          StructureStart<?> structurestart = structuremanager.a(sectionposition, structurefeature.feature, ichunkaccess);
          int j = structurestart != null ? structurestart.i() : 0;
@@ -53,7 +53,7 @@ index 11145a549..f9acbe5af 100644
          StructureSettingsFeature structuresettingsfeature = this.settings.a(structurefeature.feature);
  
          if (structuresettingsfeature != null) {
-@@ -298,6 +300,83 @@ public abstract class ChunkGenerator {
+@@ -335,6 +337,83 @@ public abstract class ChunkGenerator {
  
      }
  
@@ -151,7 +151,7 @@ index c7c2f3d22..8804ec67c 100644
  
      public StructureSettings(boolean flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 19a8d2ef9..b0793d4a1 100644
+index b3098a425..6c46dbf4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -161,7 +161,7 @@ public class CraftChunk implements Chunk {
diff --git a/CraftBukkit-Patches/0076-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0076-Only-fetch-an-online-UUID-in-online-mode.patch
index e262eab9..7415f983 100644
--- a/CraftBukkit-Patches/0076-Only-fetch-an-online-UUID-in-online-mode.patch
+++ b/CraftBukkit-Patches/0076-Only-fetch-an-online-UUID-in-online-mode.patch
@@ -1,4 +1,4 @@
-From e8e714be745a00c9c670197aa2cc240dafa2e194 Mon Sep 17 00:00:00 2001
+From c9379421ce8785136b8ac1cd336c853033e8f78e Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode
@@ -12,10 +12,10 @@ You want to store data for player "Test"  who never joined. An online UUID is cr
 The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1a907767f..f65e3aeed 100644
+index 8b87bf160..dfdfad5f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1528,8 +1528,14 @@ public final class CraftServer implements Server {
+@@ -1587,8 +1587,14 @@ public final class CraftServer implements Server {
  
          OfflinePlayer result = getPlayerExact(name);
          if (result == null) {
diff --git a/CraftBukkit-Patches/0083-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0083-BungeeCord-Chat-API.patch
index 28f009d7..55586840 100644
--- a/CraftBukkit-Patches/0083-BungeeCord-Chat-API.patch
+++ b/CraftBukkit-Patches/0083-BungeeCord-Chat-API.patch
@@ -1,4 +1,4 @@
-From f789729cb881653b6364de832ebead04e0d0cffa Mon Sep 17 00:00:00 2001
+From 013d4b9c3f0798bb7802f9b7ba9190a1f3925366 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 03:06:05 +0100
 Subject: [PATCH] BungeeCord Chat API
@@ -32,10 +32,10 @@ index c7dd76c51..b98dcd1a8 100644
          packetdataserializer.a(this.sender);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f65e3aeed..46a1d643d 100644
+index dfdfad5f6..2ed6d9edc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -235,6 +235,8 @@ import org.yaml.snakeyaml.Yaml;
+@@ -241,6 +241,8 @@ import org.yaml.snakeyaml.Yaml;
  import org.yaml.snakeyaml.constructor.SafeConstructor;
  import org.yaml.snakeyaml.error.MarkedYAMLException;
  
@@ -44,7 +44,7 @@ index f65e3aeed..46a1d643d 100644
  public final class CraftServer implements Server {
      private final String serverName = "CraftBukkit";
      private final String serverVersion;
-@@ -2167,6 +2169,20 @@ public final class CraftServer implements Server {
+@@ -2226,6 +2228,20 @@ public final class CraftServer implements Server {
          public void restart() {
              org.spigotmc.RestartCommand.restart();
          }
@@ -100,7 +100,7 @@ index 74558e852..13008357b 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 7c8b30fd2..fce8d30da 100644
+index 3aa218e7c..468e02f4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
@@ -111,7 +111,7 @@ index 7c8b30fd2..fce8d30da 100644
  import net.minecraft.core.BlockPosition;
  import net.minecraft.nbt.NBTBase;
  import net.minecraft.nbt.NBTTagCompound;
-@@ -1075,6 +1076,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1080,6 +1081,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      // Spigot start
      private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
      {
diff --git a/CraftBukkit-Patches/0087-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0087-Implement-SpawnerSpawnEvent.patch
index bc814530..d7c41524 100644
--- a/CraftBukkit-Patches/0087-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0087-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 3853e2c1d2960bf77cbf8db141f1ffa52a0da402 Mon Sep 17 00:00:00 2001
+From b682d9385c71f1c66b03ee23416e7c8d701cbb69 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 3 Mar 2016 19:45:46 +1100
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -28,7 +28,7 @@ index 0b744b2d7..e330ff646 100644
                          if (!worldserver.addAllEntitiesSafely(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
                              this.d(worldserver, blockposition);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6b0bcb1d2..0cf7ce2c5 100644
+index 1726b0291..1cfb49ff7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -225,6 +225,8 @@ import org.bukkit.inventory.InventoryView;
@@ -40,7 +40,7 @@ index 6b0bcb1d2..0cf7ce2c5 100644
  public class CraftEventFactory {
      public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.ON_FIRE);
      public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC);
-@@ -1452,6 +1454,21 @@ public class CraftEventFactory {
+@@ -1455,6 +1457,21 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/CraftBukkit-Patches/0088-Replace-chunk-loading-unloading-rate-throttling.patch b/CraftBukkit-Patches/0088-Replace-chunk-loading-unloading-rate-throttling.patch
index 7234ff74..1a901430 100644
--- a/CraftBukkit-Patches/0088-Replace-chunk-loading-unloading-rate-throttling.patch
+++ b/CraftBukkit-Patches/0088-Replace-chunk-loading-unloading-rate-throttling.patch
@@ -1,4 +1,4 @@
-From f0a11f9b418b16a373b57a4c169a1df87982176a Mon Sep 17 00:00:00 2001
+From 2e18115cc5205d7501d3cf894bcdb45f1f398f7f Mon Sep 17 00:00:00 2001
 From: Geoff Crossland <gcrossland+bukkit@gmail.com>
 Date: Thu, 26 Jan 2017 20:54:55 +0000
 Subject: [PATCH] Replace chunk loading / unloading rate throttling.
@@ -7,10 +7,10 @@ Uses a scheme based on estimated tick slack time.
 See https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/pull-requests/71/overview
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c96775266..98d1f0fcc 100644
+index e6219e027..1db3cbbdd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -183,6 +183,7 @@ import org.bukkit.event.server.ServerLoadEvent;
+@@ -185,6 +185,7 @@ import org.bukkit.event.server.ServerLoadEvent;
  // CraftBukkit end
  
  import org.bukkit.craftbukkit.SpigotTimings; // Spigot
@@ -18,7 +18,7 @@ index c96775266..98d1f0fcc 100644
  
  public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable {
  
-@@ -293,6 +294,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -295,6 +296,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public static final int TICK_TIME = 1000000000 / TPS;
      private static final int SAMPLE_INTERVAL = 100;
      public final double[] recentTps = new double[ 3 ];
@@ -26,7 +26,7 @@ index c96775266..98d1f0fcc 100644
      // Spigot end
  
      public static <S extends MinecraftServer> S a(Function<Thread, S> function) {
-@@ -1193,6 +1195,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1208,6 +1210,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      public void a(BooleanSupplier booleansupplier) {
          SpigotTimings.serverTickTimer.startTiming(); // Spigot
@@ -34,7 +34,7 @@ index c96775266..98d1f0fcc 100644
          long i = SystemUtils.getMonotonicNanos();
  
          ++this.tickCount;
-@@ -1241,6 +1244,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1256,6 +1259,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.frameTimer.a(i1 - i);
          this.profiler.exit();
          org.spigotmc.WatchdogThread.tick(); // Spigot
diff --git a/CraftBukkit-Patches/0092-Remove-DataWatcher-Locking.patch b/CraftBukkit-Patches/0092-Remove-DataWatcher-Locking.patch
index e11e640c..3db55960 100644
--- a/CraftBukkit-Patches/0092-Remove-DataWatcher-Locking.patch
+++ b/CraftBukkit-Patches/0092-Remove-DataWatcher-Locking.patch
@@ -1,4 +1,4 @@
-From d41365d3dfeda97cf97c3fd8ee30422c7252e5f8 Mon Sep 17 00:00:00 2001
+From 70b675ac361f49180ca05c9aa0312b3d3d30a4b3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 9 Jul 2019 02:18:54 -0700
 Subject: [PATCH] Remove DataWatcher Locking
@@ -140,10 +140,10 @@ index 67fd60179..60e3628fe 100644
  
      public static class Item<T> {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 82378e643..e2f4a9fbb 100644
+index e3a739448..c1d157293 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -337,6 +337,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -338,6 +338,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
          this.entityData.register(Entity.DATA_POSE, EntityPose.STANDING);
          this.entityData.register(Entity.DATA_TICKS_FROZEN, 0);
          this.initDatawatcher();