From 79fc84d5d2f5e0ca633f54980cf8ac38ad5023ad Mon Sep 17 00:00:00 2001 From: Muramasa Date: Thu, 26 May 2016 00:55:34 +0100 Subject: [PATCH] isPlasmaCellUsed additional null check --- .../java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5c480569..d29cd13c 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 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;