diff --git a/patches/server/CB-fixes.patch b/patches/server/CB-fixes.patch
index c88465731c..d020e8b434 100644
--- a/patches/server/CB-fixes.patch
+++ b/patches/server/CB-fixes.patch
@@ -110,6 +110,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return this.mapId;
      }
  
+diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java b/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
++++ b/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
+@@ -0,0 +0,0 @@ public class FieldRename {
+             .change("DAMAGE_UNDEAD", "SMITE")
+             .change("DAMAGE_ARTHROPODS", "BANE_OF_ARTHROPODS")
+             .change("LOOT_BONUS_MOBS", "LOOTING")
+-            .change("SWEEPING_EDGE", "SWEEPING")
++            // .change("SWEEPING_EDGE", "SWEEPING") // Paper - this change is incorrect, sweeping edge is the correct name
+             .change("DIG_SPEED", "EFFICIENCY")
+             .change("DURABILITY", "UNBREAKING")
+             .change("LOOT_BONUS_BLOCKS", "FORTUNE")
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java