diff --git a/patches/server/0033-Do-not-attempt-to-cast-items-to-recipes.patch b/patches/server/0033-Do-not-attempt-to-cast-items-to-recipes.patch deleted file mode 100644 index 2485e1d..0000000 --- a/patches/server/0033-Do-not-attempt-to-cast-items-to-recipes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Sun, 10 Jul 2022 02:55:33 +0100 -Subject: [PATCH] Do not attempt to cast items to recipes - - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index dbdc66620ae4284cfe96f633b1f4db46866b597b..b95c3a74be46a539ccb90774023fa506d0a7e962 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -@@ -643,6 +643,13 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit - Entry entry = (Entry) objectiterator.next(); - - worldserver.getRecipeManager().byKey((ResourceLocation) entry.getKey()).ifPresent((irecipe) -> { -+ // Scissors start - Do not attempt to cast items to recipes -+ if (!(irecipe instanceof AbstractCookingRecipe)) -+ { -+ return; -+ } -+ // Scissors end -+ - list.add(irecipe); - AbstractFurnaceBlockEntity.createExperience(worldserver, vec3d, entry.getIntValue(), ((AbstractCookingRecipe) irecipe).getExperience(), blockposition, entityplayer, itemstack, amount); // CraftBukkit - }); diff --git a/patches/server/0034-Validate-block-entity-tag-query-positions.patch b/patches/server/0033-Validate-block-entity-tag-query-positions.patch similarity index 100% rename from patches/server/0034-Validate-block-entity-tag-query-positions.patch rename to patches/server/0033-Validate-block-entity-tag-query-positions.patch diff --git a/patches/server/0035-Refuse-to-convert-legacy-messages-over-1k-characters.patch b/patches/server/0034-Refuse-to-convert-legacy-messages-over-1k-characters.patch similarity index 100% rename from patches/server/0035-Refuse-to-convert-legacy-messages-over-1k-characters.patch rename to patches/server/0034-Refuse-to-convert-legacy-messages-over-1k-characters.patch diff --git a/patches/server/0036-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch b/patches/server/0035-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch similarity index 100% rename from patches/server/0036-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch rename to patches/server/0035-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch diff --git a/patches/server/0037-Prevent-velocity-freeze.patch b/patches/server/0036-Prevent-velocity-freeze.patch similarity index 100% rename from patches/server/0037-Prevent-velocity-freeze.patch rename to patches/server/0036-Prevent-velocity-freeze.patch diff --git a/patches/server/0038-Add-Scissors-configuration-file-command.patch b/patches/server/0037-Add-Scissors-configuration-file-command.patch similarity index 100% rename from patches/server/0038-Add-Scissors-configuration-file-command.patch rename to patches/server/0037-Add-Scissors-configuration-file-command.patch diff --git a/patches/server/0039-Reject-translatable-components-with-more-than-32-pla.patch b/patches/server/0038-Reject-translatable-components-with-more-than-32-pla.patch similarity index 100% rename from patches/server/0039-Reject-translatable-components-with-more-than-32-pla.patch rename to patches/server/0038-Reject-translatable-components-with-more-than-32-pla.patch diff --git a/patches/server/0040-Patch-invalid-entity-rotation-log-spam.patch b/patches/server/0039-Patch-invalid-entity-rotation-log-spam.patch similarity index 100% rename from patches/server/0040-Patch-invalid-entity-rotation-log-spam.patch rename to patches/server/0039-Patch-invalid-entity-rotation-log-spam.patch