diff --git a/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch b/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
new file mode 100644
index 0000000..05e94a9
--- /dev/null
+++ b/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Video <videogamesm12@gmail.com>
+Date: Sun, 13 Mar 2022 06:10:22 -0600
+Subject: [PATCH] Fixes log spam caused by invalid entities in beehives
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+index 483dc52c793d9f90a35b1d091dd8ce71115e4640..61097643950b1182e3751c6a4629cf5661dcf3b8 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+@@ -11,6 +11,7 @@ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.nbt.ListTag;
+ import net.minecraft.nbt.NbtUtils;
+ import net.minecraft.network.protocol.game.DebugPackets;
++import net.minecraft.resources.ResourceLocation;
+ import net.minecraft.sounds.SoundEvents;
+ import net.minecraft.sounds.SoundSource;
+ import net.minecraft.tags.BlockTags;
+@@ -367,6 +368,13 @@ public class BeehiveBlockEntity extends BlockEntity {
+ 
+         for (int i = 0; i < nbttaglist.size(); ++i) {
+             CompoundTag nbttagcompound1 = nbttaglist.getCompound(i);
++
++            // Scissors start - Do not allow invalid entities from being used for bees
++            if (!nbttagcompound1.contains("id") || !ResourceLocation.isValidResourceLocation(nbttagcompound1.getString("id")) || EntityType.byString(nbttagcompound1.getString("id")).isEmpty()) {
++                continue;
++            }
++            // Scissor end
++
+             BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData"), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks"));
+ 
+             this.stored.add(tileentitybeehive_hivebee);
diff --git a/patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch b/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch
similarity index 100%
rename from patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch
rename to patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch
diff --git a/patches/server/0004-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch b/patches/server/0006-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch
similarity index 100%
rename from patches/server/0004-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch
rename to patches/server/0006-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch
diff --git a/patches/server/0005-fix-this-patch.patch b/patches/server/0007-fix-this-patch.patch
similarity index 100%
rename from patches/server/0005-fix-this-patch.patch
rename to patches/server/0007-fix-this-patch.patch
diff --git a/patches/server/0006-ItemEntity-Check-if-items-are-air-before-calling-set.patch b/patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch
similarity index 100%
rename from patches/server/0006-ItemEntity-Check-if-items-are-air-before-calling-set.patch
rename to patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch
diff --git a/patches/server/0007-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch b/patches/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch
similarity index 100%
rename from patches/server/0007-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch
rename to patches/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch
diff --git a/patches/server/0008-Validate-BlockState-and-SoundEvent-values.patch b/patches/server/0010-Validate-BlockState-and-SoundEvent-values.patch
similarity index 100%
rename from patches/server/0008-Validate-BlockState-and-SoundEvent-values.patch
rename to patches/server/0010-Validate-BlockState-and-SoundEvent-values.patch
diff --git a/patches/server/0009-Even-more-ResourceLocation-validation-and-log-spam-f.patch b/patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch
similarity index 100%
rename from patches/server/0009-Even-more-ResourceLocation-validation-and-log-spam-f.patch
rename to patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch
diff --git a/patches/server/0010-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch b/patches/server/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch
similarity index 100%
rename from patches/server/0010-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch
rename to patches/server/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch
diff --git a/patches/server/0011-Change-version-fetcher-to-AMG.patch b/patches/server/0013-Change-version-fetcher-to-AMG.patch
similarity index 100%
rename from patches/server/0011-Change-version-fetcher-to-AMG.patch
rename to patches/server/0013-Change-version-fetcher-to-AMG.patch
diff --git a/patches/server/0012-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch b/patches/server/0014-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
similarity index 100%
rename from patches/server/0012-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
rename to patches/server/0014-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
diff --git a/patches/server/0013-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch
similarity index 100%
rename from patches/server/0013-Prevent-attributes-with-invalid-namespaces-from-bein.patch
rename to patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch
diff --git a/patches/server/0014-Don-t-query-player-data-in-the-nbt-component.patch b/patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch
similarity index 100%
rename from patches/server/0014-Don-t-query-player-data-in-the-nbt-component.patch
rename to patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch
diff --git a/patches/server/0015-Limit-ListTags-to-1024-elements.patch b/patches/server/0017-Limit-ListTags-to-1024-elements.patch
similarity index 100%
rename from patches/server/0015-Limit-ListTags-to-1024-elements.patch
rename to patches/server/0017-Limit-ListTags-to-1024-elements.patch
diff --git a/patches/server/0016-Fix-lectern-quick-move.patch b/patches/server/0018-Fix-lectern-quick-move.patch
similarity index 100%
rename from patches/server/0016-Fix-lectern-quick-move.patch
rename to patches/server/0018-Fix-lectern-quick-move.patch
diff --git a/patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch
similarity index 100%
rename from patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch
rename to patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch
diff --git a/patches/server/0018-Fix-negative-death-times.patch b/patches/server/0020-Fix-negative-death-times.patch
similarity index 100%
rename from patches/server/0018-Fix-negative-death-times.patch
rename to patches/server/0020-Fix-negative-death-times.patch
diff --git a/patches/server/0019-Update-for-1.18.2.patch b/patches/server/0021-Update-for-1.18.2.patch
similarity index 100%
rename from patches/server/0019-Update-for-1.18.2.patch
rename to patches/server/0021-Update-for-1.18.2.patch