diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index 48b9b3613f..43170881f8 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From d8b88936b81136c99eb1bab82cf1c31079a7b1a7 Mon Sep 17 00:00:00 2001
+From fdc2c170dee0be99fab8d71daf0777a1ced71a5f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -70,10 +70,10 @@ index a6eae266d..489dd861d 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 5dc52b6b8..2c28633c4 100644
+index 8c19278f3..7f4b68dcc 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-@@ -109,6 +109,14 @@ public class EntityTNTPrimed extends Entity {
+@@ -108,6 +108,14 @@ public class EntityTNTPrimed extends Entity {
  
      protected void a(NBTTagCompound nbttagcompound) {
          this.setFuseTicks(nbttagcompound.getShort("Fuse"));
@@ -101,7 +101,7 @@ index 27debcfca..22027321b 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 10c8ece94..7e73e00ce 100644
+index 73014cd35..da29880db 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -918,6 +918,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -135,5 +135,5 @@ index 8fb0ecf52..9a5bb0222 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
index 16e4a529d3..b98b914c6d 100644
--- a/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From ecbdae558178b3ed72ee383494b9241989cb4db6 Mon Sep 17 00:00:00 2001
+From c8e70c5455757ea8fbfa886cf6e184e02b461517 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 00f0451ef8..42d9515542 100644
+index 00f0451ef..42d951554 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,7 +32,7 @@ index 00f0451ef8..42d9515542 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d004f7e620..a2e795bc28 100644
+index d004f7e62..a2e795bc2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1187,6 +1187,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -61,10 +61,10 @@ index d004f7e620..a2e795bc28 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 2c28633c42..e5170b4e6b 100644
+index 7f4b68dcc..7a8670323 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-@@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
+@@ -146,4 +146,49 @@ public class EntityTNTPrimed extends Entity {
      public int getFuseTicks() {
          return this.c;
      }
@@ -115,5 +115,5 @@ index 2c28633c42..e5170b4e6b 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 0f708cbf51..f102d88299 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0f708cbf516c53a31e2ebfedfd2ef85c3dbfab54
+Subproject commit f102d882996f7409efc2a0cc5e70a583d901097d