aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index d544f9f545..cd1e372fe2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -48,10 +48,15 @@ public class RecipeGen_Ore implements Runnable{
}
if (material.getComposites().size() >= 1 && material.getComposites().get(1) != null){
bonusB = material.getComposites().get(1).getStackMaterial();
- }
- else if (material.getComposites().get(0) != null){
- bonusB = material.getComposites().get(0).getStackMaterial();
- }
+ }
+ else if (material.getComposites().size() >= 1 && material.getComposites().get(1) == null){
+ if (material.getComposites().get(0) != null){
+ bonusB = material.getComposites().get(0).getStackMaterial();
+ }
+ else {
+ bonusB = ELEMENT.getInstance().CHROMIUM;
+ }
+ }
else {
//Ultra Bonus
bonusB = ELEMENT.getInstance().GALLIUM;
@@ -65,6 +70,9 @@ public class RecipeGen_Ore implements Runnable{
}
}
+ if (bonusA == null || bonusB == null) {
+ return;
+ }
/**
* Macerate
*/