diff --git a/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch
index b7bd347a19..7be8315621 100644
--- a/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch
@@ -166,4 +166,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
      // Paper end
  
-     private final Spigot spigot = new Spigot()
+     // Spigot start
diff --git a/Spigot-Server-Patches/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 9ad6a06d86..8a16518afa 100644
--- a/Spigot-Server-Patches/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/Spigot-Server-Patches/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
@@ -11,8 +11,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -0,0 +0,0 @@ public abstract class ChunkMapDistance {
-         long i = sectionposition.r().pair();
          ObjectSet<EntityPlayer> objectset = (ObjectSet) this.c.get(i);
+         if (objectset == null) return; // CraftBukkit - SPIGOT-6208
  
 -        objectset.remove(entityplayer);
 -        if (objectset.isEmpty()) {
diff --git a/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch
index a8cd8e38bb..09032c6bf5 100644
--- a/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch
+++ b/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch
@@ -443,10 +443,10 @@ diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -0,0 +0,0 @@ package org.spigotmc;
+@@ -0,0 +0,0 @@
+ package org.spigotmc;
  
  import java.util.Collection;
- import java.util.List;
 +
 +import net.minecraft.server.Activity;
  import net.minecraft.server.AxisAlignedBB;
@@ -634,7 +634,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
      private static void activateChunkEntities(Chunk chunk)
      {
--        for ( List<Entity> slice : chunk.entitySlices )
+-        for ( java.util.List<Entity> slice : chunk.entitySlices )
 -        {
 -            for ( Entity entity : (Collection<Entity>) slice )
 +        // Paper start
diff --git a/Spigot-Server-Patches/Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
index a353e25266..bd1cf11a9f 100644
--- a/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
@@ -158,9 +158,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
 +
+     // Spigot start
      private final Spigot spigot = new Spigot()
      {
- 
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
diff --git a/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch
index a41ecbfef3..bcf7aab3f3 100644
--- a/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch
+++ b/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch
@@ -40,34 +40,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import java.net.InetAddress;
  import java.util.ArrayList;
  import java.util.Collections;
-@@ -0,0 +0,0 @@ import net.minecraft.server.EntityAnimal;
- import net.minecraft.server.EntityAreaEffectCloud;
- import net.minecraft.server.EntityDamageSource;
- import net.minecraft.server.EntityDamageSourceIndirect;
--import net.minecraft.server.EntityEnderCrystal;
- import net.minecraft.server.EntityEnderDragon;
- import net.minecraft.server.EntityExperienceOrb;
- import net.minecraft.server.EntityFireworks;
-@@ -0,0 +0,0 @@ import net.minecraft.server.EntityVillager;
- import net.minecraft.server.EntityWaterAnimal;
- import net.minecraft.server.EnumDirection;
- import net.minecraft.server.EnumHand;
--import net.minecraft.server.EnumItemSlot;
- import net.minecraft.server.Explosion;
- import net.minecraft.server.GeneratorAccess;
- import net.minecraft.server.IBlockData;
--import net.minecraft.server.IChatBaseComponent;
- import net.minecraft.server.IInventory;
- import net.minecraft.server.IProjectile;
- import net.minecraft.server.ItemActionContext;
-@@ -0,0 +0,0 @@ import net.minecraft.server.Unit;
- import net.minecraft.server.World;
- import net.minecraft.server.WorldServer;
- import org.bukkit.Bukkit;
--import org.bukkit.Location;
- import org.bukkit.Material;
- import org.bukkit.NamespacedKey;
- import org.bukkit.Server;
 @@ -0,0 +0,0 @@ import org.bukkit.entity.ThrownPotion;
  import org.bukkit.entity.Vehicle;
  import org.bukkit.entity.Villager;
@@ -76,22 +48,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityDeathEvent;
- import org.bukkit.event.entity.EntityEnterLoveModeEvent;
- import org.bukkit.event.entity.EntityPickupItemEvent;
- import org.bukkit.event.entity.EntityPlaceEvent;
--import org.bukkit.event.entity.EntityPortalEvent;
- import org.bukkit.event.entity.EntityPotionEffectEvent;
- import org.bukkit.event.entity.EntityShootBowEvent;
- import org.bukkit.event.entity.EntitySpawnEvent;
-@@ -0,0 +0,0 @@ import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.InventoryView;
- import org.bukkit.inventory.meta.BookMeta;
- import org.bukkit.potion.PotionEffect;
--import org.bukkit.projectiles.ProjectileSource;
- 
- import org.bukkit.event.entity.SpawnerSpawnEvent; // Spigot
- 
 @@ -0,0 +0,0 @@ public class CraftEventFactory {
  
          return event;
diff --git a/Spigot-Server-Patches/Paper-config-files.patch b/Spigot-Server-Patches/Paper-config-files.patch
index 6439e257d5..afef859a46 100644
--- a/Spigot-Server-Patches/Paper-config-files.patch
+++ b/Spigot-Server-Patches/Paper-config-files.patch
@@ -687,9 +687,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     {
          return spigot;
      }
+     // Spigot end
 +
 +    // Paper start
 +    @SuppressWarnings({"rawtypes", "unchecked"})
diff --git a/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch
index d00326ee00..5a70440870 100644
--- a/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch
@@ -42,9 +42,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                        this.tileEntityListTick.remove(tileTickPosition--);
 +                        continue;
 +                        // Paper end
-                     }
-                     // Spigot start
-                     finally {
+                         // Spigot start
+                     } finally {
+                         tileentity.tickTimer.stopTiming();
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          try {
              consumer.accept(entity);
diff --git a/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch
index 1ac6ac565e..d0781edc3b 100644
--- a/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch
@@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  
 -                // Kick all players
--                for ( EntityPlayer p : (List< EntityPlayer>) MinecraftServer.getServer().getPlayerList().players )
+-                for ( EntityPlayer p : (List<EntityPlayer>) MinecraftServer.getServer().getPlayerList().players )
 -                {
 -                    p.playerConnection.disconnect(SpigotConfig.restartMessage);
 -                }
diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index 6463d4f9d0..de9978ef5c 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -1921,7 +1921,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -
 -        String name = "Task: " + plugin + " Runnable: " + taskname;
 -        if (period > 0) {
--            name += "(interval:" + period +")";
+-            name += "(interval:" + period + ")";
 -        } else {
 -            name += "(Single)";
 -        }
@@ -2120,12 +2120,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +import co.aikar.timings.NullTimingHandler;
  import org.bukkit.Bukkit;
--import org.bukkit.craftbukkit.SpigotTimings; // Spigot
--import org.spigotmc.CustomTimingsHandler; // Spigot
 +import co.aikar.timings.MinecraftTimings; // Paper
 +import co.aikar.timings.Timing; // Paper
  import org.bukkit.plugin.Plugin;
  import org.bukkit.scheduler.BukkitTask;
+-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
+ import org.spigotmc.CustomTimingsHandler; // Spigot
+ 
  
 @@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
       */
diff --git a/Spigot-Server-Patches/Tracking-Range-Improvements.patch b/Spigot-Server-Patches/Tracking-Range-Improvements.patch
index f181870a56..035839bf0f 100644
--- a/Spigot-Server-Patches/Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/Tracking-Range-Improvements.patch
@@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if ( entity instanceof EntityPlayer )
          {
              return config.playerTrackingRange;
--        }  else if ( entity.activationType == ActivationRange.ActivationType.MONSTER || entity.activationType == ActivationRange.ActivationType.RAIDER )
+-        } else if ( entity.activationType == ActivationRange.ActivationType.MONSTER || entity.activationType == ActivationRange.ActivationType.RAIDER )
 -        {
 -            return config.monsterTrackingRange;
 -        } else if ( entity instanceof EntityGhast )
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 8049146227..c631fe5579 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8049146227e4f8e44013f6b825ee91bdc7e3290f
+Subproject commit c631fe557977348f9e8a82bfc168d61584cdc1b0
diff --git a/work/Spigot b/work/Spigot
index 89d6047d1a..138d451b0c 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 89d6047d1aea78b9011ba38681663780a63233c9
+Subproject commit 138d451b0c61bdc079b46e398ba4dfdc4bd6a233