From 457ad128f9181e0df83b41123047a2dabf5f72cd Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 27 Sep 2014 12:25:31 +0200 Subject: [PATCH] Fix alloys building even though there wasn't enough liquid overall, resulting in liquids with amount 0 in the smeltery. --- src/main/java/tconstruct/library/crafting/AlloyMix.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java index 3ecdf119d16..65501950b25 100644 --- a/src/main/java/tconstruct/library/crafting/AlloyMix.java +++ b/src/main/java/tconstruct/library/crafting/AlloyMix.java @@ -31,19 +31,19 @@ public FluidStack mix (ArrayList liquids) while (iter.hasNext()) { FluidStack mixer = (FluidStack) iter.next(); - // if (mixer.itemID == liquid.itemID && mixer.itemMeta == - // liquid.itemMeta) if (mixer.isFluidEqual(liquid)) { + // do we actually have enough of that liquid? + if(liquid.amount < mixer.amount) + break; + int eAmt = liquid.amount / mixer.amount; effectiveAmount.add(eAmt); copyMix.remove(mixer); - // inputs.add(liquid); break; } } } - // } if (copyMix.size() > 0) return null;