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

Fix FluidStack now being amount-specific in its hashCode() method.

Browse source
This commit is contained in:
Ben Spiers 2015-04-17 18:29:57 +01:00
parent e6ee804686
commit 5baf4605e0
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/common/recipe/inputs/FluidInput.java
View file

@ -47,7 +47,7 @@ public class FluidInput extends MachineInput<FluidInput>
@Override
public int hashIngredients()
{
return ingredient.hashCode();
return ingredient.fluid != null ? ingredient.fluid.hashCode() : 0;
}
@Override

2
src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java
View file

@ -147,7 +147,7 @@ public class PressurizedInput extends MachineInput<PressurizedInput>
@Override
public int hashIngredients()
{
return StackUtils.hashItemStack(theSolid) << 16 | theFluid.hashCode() << 8 | theGas.hashCode();
return StackUtils.hashItemStack(theSolid) << 16 | (theFluid.fluid != null ? theFluid.fluid.hashCode() : 0) << 8 | theGas.hashCode();
}
@Override