diff options
author | Muramasa <haydenkilloh@gmail.com> | 2016-05-26 00:55:34 +0100 |
---|---|---|
committer | Muramasa <haydenkilloh@gmail.com> | 2016-05-26 00:55:34 +0100 |
commit | 79fc84d5d2f5e0ca633f54980cf8ac38ad5023ad (patch) | |
tree | 665d37c395393ddd939325593306284e68f014bb /src/main/java | |
parent | fced86e11af35318bf3ef4129dd5a6584ad079e0 (diff) | |
download | GT5-Unofficial-79fc84d5d2f5e0ca633f54980cf8ac38ad5023ad.tar.gz GT5-Unofficial-79fc84d5d2f5e0ca633f54980cf8ac38ad5023ad.tar.bz2 GT5-Unofficial-79fc84d5d2f5e0ca633f54980cf8ac38ad5023ad.zip |
isPlasmaCellUsed additional null check
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 5c480569c4..d29cd13cc7 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -820,7 +820,10 @@ public class GT_MetaGenerated_Item_01 Collection<GT_Recipe> fusionRecipes = GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList;
if(aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { //Materials has a plasma fluid
for(GT_Recipe recipe : fusionRecipes) { //Loop through fusion recipes
- if(recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L))) return true; //Fusion recipe output matches current plasma cell fluid
+ if(recipe.getFluidOutput(0) != null) { //Make sure fluid output can't be null (not sure if possible)
+ if (recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L)))
+ return true; //Fusion recipe output matches current plasma cell fluid
+ }
}
}
return false;
|