diff --git a/gradle.properties b/gradle.properties
index 6ee7412ae..72bdfe6a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = 4514f41ffa6c899c19c74d4473a2da5766d4a883
+paperCommit = 126f6d7dc164ff12a2257c14780a72341a96f2f8
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0015-ItemStack-convenience-methods.patch b/patches/api/0015-ItemStack-convenience-methods.patch
index 07bb034f9..777e8fa45 100644
--- a/patches/api/0015-ItemStack-convenience-methods.patch
+++ b/patches/api/0015-ItemStack-convenience-methods.patch
@@ -50,7 +50,7 @@ index 54704da43cf9c429f3914f0580246dde99aa93c0..e1a677cfde05aba487a09e34e170fea6
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index f603b5b6ba80af919f415322583a8345a5b1358a..5fd6ec735ff88e66c0ff0359f5838fe49fb24d08 100644
+index 8bbd98ea729755e7666403b96f277fd419560951..cb37a8af9e54349fc8a3eb70bbe2fddaaa3767d6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -19,6 +19,17 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -71,7 +71,7 @@ index f603b5b6ba80af919f415322583a8345a5b1358a..5fd6ec735ff88e66c0ff0359f5838fe4
  
  /**
   * Represents a stack of items.
-@@ -1031,4 +1042,551 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1033,4 +1044,551 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
      // Paper end - expose itemstack tooltip lines
diff --git a/patches/server/0248-Add-local-difficulty-api.patch b/patches/server/0248-Add-local-difficulty-api.patch
index c78482f4b..593fec000 100644
--- a/patches/server/0248-Add-local-difficulty-api.patch
+++ b/patches/server/0248-Add-local-difficulty-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fe9e8d1d4ae1f7a4e8f4cf5688004fc969422b3c..8e0d67f4e6e1195663fbc8c4fa850d92021cbb16 100644
+index 95de729f0a02a202632ea85a4061607d632588e9..4fd2908d726d9da48bddbd34a3461cbb3de37056 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2321,6 +2321,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2337,6 +2337,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }
  
diff --git a/patches/server/0254-Debug-Marker-API.patch b/patches/server/0254-Debug-Marker-API.patch
index 5a146bc57..98ccf73c6 100644
--- a/patches/server/0254-Debug-Marker-API.patch
+++ b/patches/server/0254-Debug-Marker-API.patch
@@ -52,10 +52,10 @@ index 0efa97d026673aae4fc60f719e18a0ce342a6cab..8bd0bb8b9593347bd249312af3832a4c
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8e0d67f4e6e1195663fbc8c4fa850d92021cbb16..00ad22ce430d1c866b254a4eb1f3a242cb8503ea 100644
+index 4fd2908d726d9da48bddbd34a3461cbb3de37056..b008dab82d6a4aafb3cd8d625e87c103b7f6395f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2325,6 +2325,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2341,6 +2341,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public float getLocalDifficultyAt(Location location) {
          return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
      }