From d8beaa92b94776d2b476c20fb2547e7cb5ebf692 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Dec 2014 13:54:47 -0800 Subject: [PATCH] Fix #367 Fix fabricator crash --- .../java/forestry/factory/gadgets/MachineFabricator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 8e10ad22e..6bf4f9f12 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -412,14 +412,13 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial public boolean hasWork() { ItemStack itemToMelt = inventory.getStackInSlot(SLOT_METAL); Smelting smelting = RecipeManager.findMatchingSmelting(itemToMelt); - FluidStack liquid = smelting.getProduct(); - if (moltenTank.fill(liquid, false) > 0) + if (smelting != null && moltenTank.fill(smelting.getProduct(), false) > 0) return true; ItemStack plan = inventory.getStackInSlot(SLOT_PLAN); ItemStack[] resources = inventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); - return RecipeManager.findMatchingRecipe(plan, liquid, resources) != null; + return RecipeManager.findMatchingRecipe(plan, moltenTank.getFluid(), resources) != null; } public int getHeatScaled(int i) {