diff --git a/patches/server/0007-Removes-useless-spammy-error-logging.patch b/patches/server/0007-Removes-useless-spammy-error-logging.patch
new file mode 100644
index 0000000..c552b03
--- /dev/null
+++ b/patches/server/0007-Removes-useless-spammy-error-logging.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Video <videogamesm12@gmail.com>
+Date: Sun, 13 Mar 2022 07:47:20 -0600
+Subject: [PATCH] Removes useless spammy error logging
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+index 1fe46049cc33c24db04fbfcde36ab275c03177bf..65844bb02bd3d9ef566d4779106a1f9ef2a2b7bc 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -1766,6 +1766,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+         try {
+             blockParser = blockParser.parse(false);
+         } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
++            // Scissors - Don't log errors thrown by Brigadier when an error is thrown
+             return null;
+         }
+ 
+@@ -1791,8 +1792,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+                 resource = CraftNamespacedKey.fromMinecraft(key);
+             }
+         } catch (IllegalArgumentException ex) {
+-            org.bukkit.Bukkit.getLogger().warning("Namespaced resource does not validate: " + key.toString());
+-            ex.printStackTrace();
++            // Scissors - Don't log errors thrown by invalid namespaces when an error is thrown
+         }
+ 
+         return resource;
diff --git a/patches/server/0007-fix-this-patch.patch b/patches/server/0008-fix-this-patch.patch
similarity index 100%
rename from patches/server/0007-fix-this-patch.patch
rename to patches/server/0008-fix-this-patch.patch
diff --git a/patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch b/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch
similarity index 100%
rename from patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch
rename to patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch
diff --git a/patches/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch b/patches/server/0010-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch
similarity index 100%
rename from patches/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch
rename to patches/server/0010-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch
diff --git a/patches/server/0010-Validate-BlockState-and-SoundEvent-values.patch b/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch
similarity index 100%
rename from patches/server/0010-Validate-BlockState-and-SoundEvent-values.patch
rename to patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch
diff --git a/patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch b/patches/server/0012-Even-more-ResourceLocation-validation-and-log-spam-f.patch
similarity index 100%
rename from patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch
rename to patches/server/0012-Even-more-ResourceLocation-validation-and-log-spam-f.patch
diff --git a/patches/server/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch b/patches/server/0013-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch
similarity index 100%
rename from patches/server/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch
rename to patches/server/0013-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch
diff --git a/patches/server/0013-Change-version-fetcher-to-AMG.patch b/patches/server/0014-Change-version-fetcher-to-AMG.patch
similarity index 100%
rename from patches/server/0013-Change-version-fetcher-to-AMG.patch
rename to patches/server/0014-Change-version-fetcher-to-AMG.patch
diff --git a/patches/server/0014-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch b/patches/server/0015-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
similarity index 100%
rename from patches/server/0014-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
rename to patches/server/0015-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
diff --git a/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch
similarity index 93%
rename from patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch
rename to patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch
index 6ff33a4..7ced1d6 100644
--- a/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch
+++ b/patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent attributes with invalid namespaces from being applied
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 1fe46049cc33c24db04fbfcde36ab275c03177bf..a6d600ef4a90f54123ea53273bc83f1462f8e9f7 100644
+index 65844bb02bd3d9ef566d4779106a1f9ef2a2b7bc..f856ac2dfe55a1f1f63725ec20e7b8dd3d394acf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -46,6 +46,7 @@ import net.minecraft.nbt.NbtIo;
diff --git a/patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch b/patches/server/0017-Don-t-query-player-data-in-the-nbt-component.patch
similarity index 100%
rename from patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch
rename to patches/server/0017-Don-t-query-player-data-in-the-nbt-component.patch
diff --git a/patches/server/0017-Limit-ListTags-to-1024-elements.patch b/patches/server/0018-Limit-ListTags-to-1024-elements.patch
similarity index 100%
rename from patches/server/0017-Limit-ListTags-to-1024-elements.patch
rename to patches/server/0018-Limit-ListTags-to-1024-elements.patch
diff --git a/patches/server/0018-Fix-lectern-quick-move.patch b/patches/server/0019-Fix-lectern-quick-move.patch
similarity index 100%
rename from patches/server/0018-Fix-lectern-quick-move.patch
rename to patches/server/0019-Fix-lectern-quick-move.patch
diff --git a/patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch
similarity index 100%
rename from patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch
rename to patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch
diff --git a/patches/server/0020-Fix-negative-death-times.patch b/patches/server/0021-Fix-negative-death-times.patch
similarity index 100%
rename from patches/server/0020-Fix-negative-death-times.patch
rename to patches/server/0021-Fix-negative-death-times.patch
diff --git a/patches/server/0021-Update-for-1.18.2.patch b/patches/server/0022-Update-for-1.18.2.patch
similarity index 100%
rename from patches/server/0021-Update-for-1.18.2.patch
rename to patches/server/0022-Update-for-1.18.2.patch