Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed infinite fuel production.

Browse source
This commit is contained in:
SirSengir 2012-07-14 18:04:30 +02:00
parent 760dcf1d17
commit 8b8471fca2
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/net/minecraft/src/buildcraft/api/liquids/LiquidStack.java
View file

@ -92,6 +92,17 @@ public class LiquidStack {
return itemID == other.itemID && itemMeta == other.itemMeta; return itemID == other.itemID && itemMeta == other.itemMeta;
} }
/**
* @param other
* @return true if this LiquidStack contains the other liquid (liquids are equal and amount >= other.amount).
*/
public boolean containsLiquid(LiquidStack other) {
if(!isLiquidEqual(other))
return false;
return amount >= other.amount;
}
/** /**
* @param other ItemStack containing liquids. * @param other ItemStack containing liquids.
* @return true if this LiquidStack contains the same liquid as the one passed in. * @return true if this LiquidStack contains the same liquid as the one passed in.

2
common/net/minecraft/src/buildcraft/factory/TileRefinery.java
View file

@ -286,7 +286,7 @@ public class TileRefinery extends TileMachine implements ILiquidContainer, IPowe
if(liquid == null) if(liquid == null)
return true; return true;
return liquid.isLiquidEqual(new LiquidStack(slot1.liquidId, slot1.quantity, 0)) || liquid.isLiquidEqual(new LiquidStack(slot2.liquidId, slot2.quantity, 0)); return new LiquidStack(slot1.liquidId, slot1.quantity, 0).containsLiquid(liquid) || new LiquidStack(slot2.liquidId, slot2.quantity, 0).containsLiquid(liquid);
} }
private boolean consumeInput(LiquidStack liquid) { private boolean consumeInput(LiquidStack liquid) {