|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Jake Potrebic <jake.m.potrebic@gmail.com> |
| 3 | +Date: Sat, 1 Jan 2022 23:11:26 -0800 |
| 4 | +Subject: [PATCH] Fix FurnaceInventory for smokers and blast furnaces |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java |
| 8 | +index 54e61b9b058bee2167461aaaf828ed7a00949c29..53421f780ac8bc2a67f64671fcad632fcdb8bede 100644 |
| 9 | +--- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java |
| 10 | ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java |
| 11 | +@@ -65,7 +65,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat |
| 12 | + return new CraftInventory(tileEntity); |
| 13 | + } |
| 14 | + |
| 15 | +- public static class Furnace extends CraftTileInventoryConverter { |
| 16 | ++ public static class Furnace extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical |
| 17 | + |
| 18 | + @Override |
| 19 | + public Container getTileEntity() { |
| 20 | +@@ -73,6 +73,11 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat |
| 21 | + return furnace; |
| 22 | + } |
| 23 | + |
| 24 | ++ // Paper start - abstract furnace converter to apply to all 3 furnaces |
| 25 | ++ } |
| 26 | ++ |
| 27 | ++ public static abstract class AbstractFurnaceInventoryConverter extends CraftTileInventoryConverter { |
| 28 | ++ // Paper end |
| 29 | + // Paper start |
| 30 | + @Override |
| 31 | + public Inventory createInventory(InventoryHolder owner, InventoryType type, net.kyori.adventure.text.Component title) { |
| 32 | +@@ -170,7 +175,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat |
| 33 | + } |
| 34 | + } |
| 35 | + |
| 36 | +- public static class BlastFurnace extends CraftTileInventoryConverter { |
| 37 | ++ public static class BlastFurnace extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical |
| 38 | + |
| 39 | + @Override |
| 40 | + public Container getTileEntity() { |
| 41 | +@@ -186,7 +191,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat |
| 42 | + } |
| 43 | + } |
| 44 | + |
| 45 | +- public static class Smoker extends CraftTileInventoryConverter { |
| 46 | ++ public static class Smoker extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical |
| 47 | + |
| 48 | + @Override |
| 49 | + public Container getTileEntity() { |
0 commit comments