Merge pull request #649 from AartBluestoke/upstreamMaster
another null check needed
This commit is contained in:
commit
6431318a8d
1 changed files with 3 additions and 1 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue