Add checks to prevent crash on item inseration into generators

2 files changed, 3 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
index 34166162bf..e2103c02bf 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
@@ -12,6 +12,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenera
 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_Recipe;

+import gregtech.api.util.GT_Utility;

 import net.minecraft.item.ItemStack;

 

 public class GT_MetaTileEntity_DieselGenerator

@@ -54,6 +55,7 @@ public class GT_MetaTileEntity_DieselGenerator
     }

 

     public int getFuelValue(ItemStack aStack) {

+    	 if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;

         int rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack));

         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {

             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
index 99bbe17508..bf6d39c916 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
@@ -56,6 +56,7 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
     }

 

     public int getFuelValue(FluidStack aLiquid) {

+    	if(aLiquid==null)return 0;

     	String fluidName = aLiquid.getFluid().getUnlocalizedName(aLiquid);

         return GT_ModHandler.isSteam(aLiquid) || fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name") ? 3 : 0;

     }