tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Gas Tanks filling from the wrong type of gas.

Browse source 
(eg. in a Chemical Injection Chamber.)
This commit is contained in:
Ben Spiers 2014-09-07 00:15:00 +01:00
parent b75ff5d9a1
commit bafdb18756
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/api/gas/GasTank.java
View file

@ -79,7 +79,7 @@ public class GasTank
*/
public int receive(GasStack amount, boolean doReceive)
{
if(amount == null || (stored != null && stored.amount == getMaxGas()))
if(amount == null || (stored != null && !(stored.amount != getMaxGas() && stored.isGasEqual(amount))))
{
return 0;
}

2
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
View file

@ -145,7 +145,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
GasStack stack = getItemGas(inventory[1]);
int gasNeeded = gasTank.getNeeded();
if(stack != null && stack.amount <= gasNeeded)
if(stack != null && gasTank.canReceive(stack.getGas()) && gasNeeded >= stack.amount)
{
gasTank.receive(stack, true);