diff --git a/patches/unapplied/server/0607-Stinger-API.patch b/patches/server/0588-Stinger-API.patch
similarity index 89%
rename from patches/unapplied/server/0607-Stinger-API.patch
rename to patches/server/0588-Stinger-API.patch
index 7a81c96422..0f26339ad5 100644
--- a/patches/unapplied/server/0607-Stinger-API.patch
+++ b/patches/server/0588-Stinger-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a3b9b512c4962c5d38598a504e8f0010304abdc0..4461663659f351f844ed78adc8c1ffd0531a7878 100644
+index f95e991f1cc7187fc1795af5a4d85a91dd6b66f8..0c718dc32beb7c4afec64c19edcef41bdf1b8e39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -354,6 +354,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -353,6 +353,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          // Paper end
      }
@@ -20,7 +20,7 @@ index a3b9b512c4962c5d38598a504e8f0010304abdc0..4461663659f351f844ed78adc8c1ffd0
  
      // Paper start - Add methods for working with arrows stuck in living entities
      @Override
-@@ -368,6 +373,34 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -367,6 +372,34 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      }
      // Paper end - Add methods for working with arrows stuck in living entities
  
diff --git a/patches/unapplied/server/0608-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/removed-patches-1-20-5/0608-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/unapplied/server/0608-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to removed-patches-1-20-5/0608-Fix-incosistency-issue-with-empty-map-items-in-CB.patch