Move diffs around to compile without later ones applied

1 files changed, 19 insertions, 0 deletions

diff --git a/patches/server/0861-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0861-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
new file mode 100644
index 0000000000..576441539c
--- /dev/null
+++ b/patches/server/0861-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 19 Mar 2023 20:36:22 -0700
+Subject: [PATCH] Fix crash relating to bad recipes in furnace-like tile
+ entities
+
+
+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 d7beeac4a8e4a16221809663a5aa03389a759742..d04fc84eef11adb5ea64077f48794b6ed7fb3ada 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,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+             Entry<ResourceLocation> entry = (Entry) objectiterator.next();
+ 
+             worldserver.getRecipeManager().byKey((ResourceLocation) entry.getKey()).ifPresent((recipeholder) -> {
++                if (!(recipeholder.value() instanceof AbstractCookingRecipe)) return; // Paper - don't process non-cooking recipes
+                 list.add(recipeholder);
+                 AbstractFurnaceBlockEntity.createExperience(worldserver, vec3d, entry.getIntValue(), ((AbstractCookingRecipe) recipeholder.value()).getExperience(), blockposition, entityplayer, itemstack, amount); // CraftBukkit
+             });