Fix #1639 Thermionic Fabricator & Glass Pane

ForestryMC · Mar 26, 2017 · 2c9a30d · 2c9a30d
1 parent 4a31215
commit 2c9a30d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java
@@ -30,6 +30,7 @@
 
 public class FabricatorRecipeManager implements IFabricatorManager {
 
+	public static final Pair EMPTY_RECIPE = Pair.of(null, null);
 	private static final Set<IFabricatorRecipe> recipes = new HashSet<>();
 
 	@Override
@@ -55,7 +56,7 @@ public static Pair<IFabricatorRecipe, String[][]> findMatchingRecipe(ItemStack p
 			}
 		}
 
-		return Pair.of(null, null);
+		return EMPTY_RECIPE;
 	}
 
 	public static boolean isPlan(ItemStack plan) {

diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java
@@ -178,9 +178,8 @@ private Pair<IFabricatorRecipe, String[][]> getRecipe() {
 		return recipePair;
 	}
 
-	public ItemStack getResult() {
-		IFabricatorRecipe myRecipe = getRecipe().getLeft();
-
+	public ItemStack getResult(Pair<IFabricatorRecipe, String[][]> myRecipePair) {
+		IFabricatorRecipe myRecipe = myRecipePair.getLeft();
 		if (myRecipe == null) {
 			return ItemStack.EMPTY;
 		}
@@ -198,7 +197,7 @@ public void onTake(int slotIndex, EntityPlayer player) {
 
 	private void craftResult() {
 		Pair<IFabricatorRecipe, String[][]> myRecipePair = getRecipe();
-		ItemStack craftResult = getResult();
+		ItemStack craftResult = getResult(myRecipePair);
 		IFabricatorRecipe myRecipe = myRecipePair.getLeft();
 		if (myRecipe != null && !craftResult.isEmpty() && getStackInSlot(InventoryFabricator.SLOT_RESULT).isEmpty()) {
 			FluidStack liquid = myRecipe.getLiquid();