From e6daa173c0a6ba75c2ecd61704ac4fa91aa999e9 Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Sun, 19 Feb 2017 04:03:45 +1000
Subject: $ Fixed an issue where invalid fluids generated, causing the fluid
 registry to corrupt. % LFTR & FFPP work.

---
 src/Java/gtPlusPlus/core/material/Material.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 6f111b6551..e1aa0d730b 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -30,7 +30,7 @@ public class Material {
 	private ArrayList<MaterialStack> vMaterialInput = new ArrayList<MaterialStack>();
 	public final long[] vSmallestRatio;
 	public final short vComponentCount;
-	
+
 	private final short[] RGBA;
 
 	private final boolean usesBlastFurnace;
@@ -101,7 +101,7 @@ public class Material {
 						if (m.getStackMaterial().vDurability != 0){
 							durabilityTemp =  (durabilityTemp+m.getStackMaterial().vDurability);
 							counterTemp++;
-							
+
 						}
 					}					
 				}
@@ -425,12 +425,12 @@ public class Material {
 		}
 		return new int[]{};
 	}
-	
+
 	private final short getComponentCount(MaterialStack[] inputs){
 		int counterTemp = 0;
 		for (MaterialStack m : inputs){
 			if (m.getStackMaterial() != null){
-					counterTemp++;				
+				counterTemp++;				
 			}					
 		}
 		if (counterTemp != 0){
@@ -538,6 +538,13 @@ public class Material {
 	}
 
 	public final Fluid generateFluid(){
+
+		try {
+			if (Materials.get(localizedName) == Materials.Clay){
+				return null;
+			}
+		} catch (Throwable e){}
+
 		if (Materials.get(localizedName).mFluid == null){
 			Utils.LOG_WARNING("Generating our own fluid.");
 
@@ -562,7 +569,7 @@ public class Material {
 
 	public final Fluid generatePlasma(){
 		Materials isValid = Materials.get(getLocalizedName());
-		if (isValid != Materials._NULL && isValid != null){
+		if (isValid != Materials._NULL && isValid != null && isValid != Materials.Clay){
 			if (isValid.mPlasma != null){
 				Utils.LOG_INFO("Using a pre-defined Plasma from GT.");
 				return isValid.mPlasma;
-- 
cgit