aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java')
-rw-r--r--src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
index 4be90061a0..1073e63914 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
@@ -71,11 +71,13 @@ public class ShapedRecipe {
if (aOutput != null && xNull < 9) {
for (ItemStack q : mBlackList) {
- if (q.isItemEqual(aOutput)) {
- Logger.RECIPE("Found recipe Alkalus is Debugging.");
- }
+ if (q != null) {
+ if (q.isItemEqual(aOutput)) {
+ Logger.RECIPE("Found recipe Alkalus is Debugging.");
+ }
+ }
}
-
+
Object[] mVarags2 = null;
Logger.RECIPE("Generating Shaped Crafting Recipe for "+aOutput.getDisplayName());
@@ -188,14 +190,14 @@ public class ShapedRecipe {
for (Pair<Character, Object> r : aRecipePairs) {
char c = r.getKey();
Object o = r.getValue();
-
+
if (o instanceof ItemStack || o instanceof Item) {
if (o instanceof Item) {
o = ItemUtils.getSimpleStack((Item) o);
}
o = ((ItemStack) o).copy();
}
-
+
mVarags2[counter2] = (char) c;
mVarags2[counter2+1] = o;
counter2 += 2;