Merge branch 'master' of github.com:BuildCraft/BuildCraft

This commit is contained in:
Player 2013-02-21 00:28:49 +01:00
commit f1a7ebf484

View file

@ -148,7 +148,9 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory {
if(this.currentRecipe == null || !this.currentRecipe.matches(craftMatrix, worldObj))
currentRecipe = CraftingHelper.findMatchingRecipe(craftMatrix, worldObj);
return currentRecipe.getCraftingResult(craftMatrix);
if(currentRecipe!=null)
return currentRecipe.getCraftingResult(craftMatrix);
return null;
}
public ItemStack extractItem(boolean doRemove, boolean removeRecipe) {