Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #649 from AartBluestoke/upstreamMaster

Browse source 
another null check needed
This commit is contained in:
SirSengir 2013-02-20 08:11:05 -08:00
commit 6431318a8d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/factory/TileAutoWorkbench.java
View file

@ -148,7 +148,9 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory {
if(this.currentRecipe == null || !this.currentRecipe.matches(craftMatrix, worldObj)) if(this.currentRecipe == null || !this.currentRecipe.matches(craftMatrix, worldObj))
currentRecipe = CraftingHelper.findMatchingRecipe(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) { public ItemStack extractItem(boolean doRemove, boolean removeRecipe) {