diff --git a/gradle.properties b/gradle.properties
index 14761021c..e65928ba2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 8f949511b8394c4ecbb722e1c969a552c6ac00cc
+paperCommit = bc127ea819df17e60ecb76e3cd0abec730422de1
 
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
diff --git a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
index fb221980e..eef154140 100644
--- a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
@@ -7,10 +7,10 @@ Makes it so that when a TileEntity is placed in the world and then broken,
 the dropped ItemStack retains any original custom display name/lore.
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index 44b28773fe8e79931e738d493bd9405e0ee3dca9..d9114ee2ef4f1dee7ae018f932a7804a61a90ef6 100644
+index 8e6df16568c0dab482e10ad1b38920d77f6e684f..6c261b9ddee80139140bd1f091fcdacc3a70c8ef 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -133,7 +133,24 @@ public class BlockItem extends Item {
+@@ -137,7 +137,24 @@ public class BlockItem extends Item {
      }
  
      protected boolean updateCustomBlockEntityTag(BlockPos pos, Level world, @Nullable Player player, ItemStack stack, BlockState state) {
diff --git a/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch
index d9f26f09f..b1524cbef 100644
--- a/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch
+++ b/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] option to disable shulker box items from dropping contents
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index d9114ee2ef4f1dee7ae018f932a7804a61a90ef6..8b521ee48480d3eb5cc77051c425ff4552a86a09 100644
+index 6c261b9ddee80139140bd1f091fcdacc3a70c8ef..65917d1438b0f480385e9117ba2a386e990b9a0b 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -296,7 +296,7 @@ public class BlockItem extends Item {
+@@ -300,7 +300,7 @@ public class BlockItem extends Item {
  
      @Override
      public void onDestroyed(ItemEntity entity) {