aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
committerShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
commitc6ea84c7fae8d2974820333505a39c7b01c39b90 (patch)
tree0a863ecd50aa71b1196200c545651fe7eb779e2a /patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
parentd3caeeb6c27cc832030a90c714a69ad2457b6e95 (diff)
downloadPaper-c6ea84c7fae8d2974820333505a39c7b01c39b90.tar.gz
Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.zip
Drop unneeded desync patch
spigot no longer even fires the event for this case, so, this may actually be a regression, not too sure here, but, as-is this patch is dead
Diffstat (limited to 'patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch')
-rw-r--r--patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
new file mode 100644
index 0000000000..9f3ee548ee
--- /dev/null
+++ b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Thu, 23 Dec 2021 15:32:50 -0600
+Subject: [PATCH] Expose isFuel and canSmelt methods to FurnaceInventory
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
+index 05c29a788c96282fc18066ae253cf0b5be37e95c..e8e53d3c7d8b1bba7d77dc0c76d242eb177ad851 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
+@@ -40,6 +40,20 @@ public class CraftInventoryFurnace extends CraftInventory implements FurnaceInve
+ setItem(0, stack);
+ }
+
++ // Paper start
++ @Override
++ public boolean isFuel(ItemStack stack) {
++ return stack != null && !stack.getType().isEmpty() && AbstractFurnaceBlockEntity.isFuel(CraftItemStack.asNMSCopy(stack));
++ }
++
++ @Override
++ public boolean canSmelt(ItemStack stack) {
++ // data packs are always loaded in the main world
++ net.minecraft.server.level.ServerLevel world = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorlds().get(0)).getHandle();
++ return stack != null && !stack.getType().isEmpty() && world.getRecipeManager().getRecipeFor(((AbstractFurnaceBlockEntity) this.inventory).recipeType, new net.minecraft.world.SimpleContainer(CraftItemStack.asNMSCopy(stack)), world).isPresent();
++ }
++ // Paper end
++
+ @Override
+ public Furnace getHolder() {
+ return (Furnace) inventory.getOwner();