diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index fa141b414d..8de4bbcd2d 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From 5da75bccc7609d731a581c3220f046e6bc9f08f8 Mon Sep 17 00:00:00 2001
+From 41621b25e0cf0bfeb03eae74642833149b45a8f9 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d6f9836a1..9cb41f101 100644
+index 85fb83c1..5ed0be71 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -612,4 +612,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -610,4 +610,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      @Override
      Spigot spigot();
      // Spigot end
@@ -26,7 +26,7 @@ index d6f9836a1..9cb41f101 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 64f9d3fd8..14cb0d770 100644
+index 64f9d3fd..14cb0d77 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
@@ -46,7 +46,7 @@ index 64f9d3fd8..14cb0d770 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index 5a8789324..3022b4a27 100644
+index 5a878932..3022b4a2 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
 @@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive {
@@ -66,5 +66,5 @@ index 5a8789324..3022b4a27 100644
 +    }
  }
 -- 
-2.22.1
+2.24.0
 
diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch
index dda4bfe458..199d35708c 100644
--- a/Spigot-API-Patches/0008-Version-Command-2.0.patch
+++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch
@@ -1,4 +1,4 @@
-From 6124a93a7105107c53e80a258380ffd286354c31 Mon Sep 17 00:00:00 2001
+From ee371574e60d48deec48728d90765e89fbc2532a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 27 May 2019 01:10:06 -0500
 Subject: [PATCH] Version Command 2.0
@@ -6,7 +6,7 @@ Subject: [PATCH] Version Command 2.0
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
 new file mode 100644
-index 000000000..2a2651299
+index 00000000..2a265129
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
 @@ -0,0 +1,44 @@
@@ -55,7 +55,7 @@ index 000000000..2a2651299
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 72c5501e8..c0ff133de 100644
+index 72c5501e..c0ff133d 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -76,5 +76,12 @@ public interface UnsafeValues {
@@ -72,7 +72,7 @@ index 72c5501e8..c0ff133de 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index cbce52444..0486abd19 100644
+index 9d8360f7..9a3bb0e9 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -1,5 +1,6 @@
@@ -98,7 +98,7 @@ index cbce52444..0486abd19 100644
      public VersionCommand(@NotNull String name) {
          super(name);
  
-@@ -150,18 +160,18 @@ public class VersionCommand extends BukkitCommand {
+@@ -151,18 +161,18 @@ public class VersionCommand extends BukkitCommand {
  
      private void sendVersion(@NotNull CommandSender sender) {
          if (hasVersion) {
@@ -120,7 +120,7 @@ index cbce52444..0486abd19 100644
                  return;
              }
              versionWaiters.add(sender);
-@@ -183,7 +193,12 @@ public class VersionCommand extends BukkitCommand {
+@@ -184,7 +194,12 @@ public class VersionCommand extends BukkitCommand {
  
      private void obtainVersion() {
          String version = Bukkit.getVersion();
@@ -134,7 +134,7 @@ index cbce52444..0486abd19 100644
          if (version.startsWith("git-Spigot-")) {
              String[] parts = version.substring("git-Spigot-".length()).split("-");
              int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' ')));
-@@ -213,6 +228,9 @@ public class VersionCommand extends BukkitCommand {
+@@ -214,6 +229,9 @@ public class VersionCommand extends BukkitCommand {
          } else {
              setVersionMessage("Unknown version, custom build?");
          }
@@ -144,7 +144,7 @@ index cbce52444..0486abd19 100644
      }
  
      private void setVersionMessage(@NotNull String msg) {
-@@ -222,8 +240,13 @@ public class VersionCommand extends BukkitCommand {
+@@ -223,8 +241,13 @@ public class VersionCommand extends BukkitCommand {
          try {
              hasVersion = true;
              versionTaskStarted = false;
@@ -159,7 +159,7 @@ index cbce52444..0486abd19 100644
              }
              versionWaiters.clear();
          } finally {
-@@ -231,6 +254,15 @@ public class VersionCommand extends BukkitCommand {
+@@ -232,6 +255,15 @@ public class VersionCommand extends BukkitCommand {
          }
      }
  
@@ -176,5 +176,5 @@ index cbce52444..0486abd19 100644
          try {
              BufferedReader reader = Resources.asCharSource(
 -- 
-2.21.0
+2.24.0
 
diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
index edf2dbe25e..d8d0376618 100644
--- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
@@ -1,14 +1,14 @@
-From bb5fbadd8a83da05bf97bee17be747e7a1211d8b Mon Sep 17 00:00:00 2001
+From 6b693ff4425d9b346bd9c19cc64e97b1862e96a8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9cb41f101..ade1bf5f1 100644
+index 5ed0be71..d088490f 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -623,5 +623,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -621,5 +621,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @Nullable
      Location getOrigin();
@@ -22,5 +22,5 @@ index 9cb41f101..ade1bf5f1 100644
      // Paper end
  }
 -- 
-2.22.1
+2.24.0
 
diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch
index d4187c5900..65af86de82 100644
--- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From aad3f10a51d870c9362a602a3dad7e9472880a8d Mon Sep 17 00:00:00 2001
+From 77ef58bd694a6a39109f73570fe9b0cf2487884d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index ade1bf5f1..5a7776fa4 100644
+index d088490f..1171b103 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index ade1bf5f1..5a7776fa4 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Nameable;
-@@ -630,5 +631,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -628,5 +629,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
@@ -32,5 +32,5 @@ index ade1bf5f1..5a7776fa4 100644
      // Paper end
  }
 -- 
-2.22.1
+2.24.0
 
diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch
index c1a33e7873..5534e0527a 100644
--- a/Spigot-API-Patches/0133-Async-Chunks-API.patch
+++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch
@@ -1,4 +1,4 @@
-From b8c066af3a770415b3ca9f8a8a16f19a6b1a6f8c Mon Sep 17 00:00:00 2001
+From e9382947de5cb8b5bc680815fe9bc811b59ef058 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 189df011..d4fcbf60 100644
+index b80b8b3b..7a0b66fe 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -172,6 +172,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -371,10 +371,10 @@ index 189df011..d4fcbf60 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 2d3cee14..f41243f9 100644
+index e5756c42..da7b35f0 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -157,6 +157,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -155,6 +155,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause);
  
@@ -406,5 +406,5 @@ index 2d3cee14..f41243f9 100644
       * Returns a list of entities within a bounding box centered around this
       * entity
 -- 
-2.22.0
+2.24.0
 
diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
index 9b5eae754c..71a44a5999 100644
--- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From c6ad801f5bc4b5336f6f1e09679d9e31f5c5c4dc Mon Sep 17 00:00:00 2001
+From 5a4094e7f3aad507d9f44cacfddd6a6bb705421d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e063733fa..98b26cd93 100644
+index da7b35f0..ac28ba01 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -663,5 +663,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -661,5 +661,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull
      Chunk getChunk();
@@ -26,5 +26,5 @@ index e063733fa..98b26cd93 100644
      // Paper end
  }
 -- 
-2.22.1
+2.24.0
 
diff --git a/Spigot-Server-Patches/0187-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0187-API-to-get-a-BlockState-without-a-snapshot.patch
index bfdb45a787..1d908c753e 100644
--- a/Spigot-Server-Patches/0187-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0187-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 7cbfeb0fcca8c47db678223b0d478e2367b9f8a6 Mon Sep 17 00:00:00 2001
+From 3da7acd8b4c3fb3ae58fe3f8c2c3210ef0f1a790 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index af6977dcdc..c72b013868 100644
+index af6977dcd..c72b01386 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -230,7 +230,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -39,10 +39,10 @@ index af6977dcdc..c72b013868 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 2bc0b2e093..166c918d73 100644
+index d3e524093..da3c50c70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -312,6 +312,20 @@ public class CraftBlock implements Block {
+@@ -309,6 +309,20 @@ public class CraftBlock implements Block {
  
      @Override
      public BlockState getState() {
@@ -64,7 +64,7 @@ index 2bc0b2e093..166c918d73 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 17d80b5c6e..f6401e2cde 100644
+index 17d80b5c6..f6401e2cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 17d80b5c6e..f6401e2cde 100644
  
      private T createSnapshot(T tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 15022ada0c..af15656cc4 100644
+index 15022ada0..af15656cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
@@ -131,5 +131,5 @@ index 15022ada0c..af15656cc4 100644
  
      @Override
 -- 
-2.22.0
+2.24.0
 
diff --git a/Spigot-Server-Patches/0389-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0389-Implement-CraftBlockSoundGroup.patch
index ded6d3ad5e..ecbe446a38 100644
--- a/Spigot-Server-Patches/0389-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0389-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From df2c2f7e72bb4e4b57873c0f9ccf6cec357f3270 Mon Sep 17 00:00:00 2001
+From c2bb45f28211e458441b8898073e13cc9cf3cb52 Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
@@ -96,10 +96,10 @@ index 5460d409b..ccd5b0529 100644
          return this.C;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 166c918d7..5296c6d9b 100644
+index da3c50c70..d9749adb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -689,4 +689,11 @@ public class CraftBlock implements Block {
+@@ -694,4 +694,11 @@ public class CraftBlock implements Block {
          AxisAlignedBB aabb = shape.getBoundingBox();
          return new BoundingBox(getX() + aabb.minX, getY() + aabb.minY, getZ() + aabb.minZ, getX() + aabb.maxX, getY() + aabb.maxY, getZ() + aabb.maxZ);
      }
@@ -112,5 +112,5 @@ index 166c918d7..5296c6d9b 100644
 +    // Paper end
  }
 -- 
-2.23.0
+2.24.0
 
diff --git a/work/Bukkit b/work/Bukkit
index af58d31600..8b6dd10383 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit af58d31600e40bb1eaf7caa782e39e1d4f3b82ef
+Subproject commit 8b6dd103832def3e8d1a7c3cdb98cde9826d543c
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 43183eabc2..656701746a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 43183eabc2d3f438cc9053a0cbb87c2c683b6f70
+Subproject commit 656701746abf477beb78cb6108298b20dc053cf1