From 5baf4605e0aab0c1ea6c2d12c14c7f8fcb1bbaf8 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 17 Apr 2015 18:29:57 +0100 Subject: [PATCH] Fix FluidStack now being amount-specific in its hashCode() method. --- src/main/java/mekanism/common/recipe/inputs/FluidInput.java | 2 +- .../java/mekanism/common/recipe/inputs/PressurizedInput.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/recipe/inputs/FluidInput.java b/src/main/java/mekanism/common/recipe/inputs/FluidInput.java index db2412faa..9a7237542 100644 --- a/src/main/java/mekanism/common/recipe/inputs/FluidInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/FluidInput.java @@ -47,7 +47,7 @@ public class FluidInput extends MachineInput @Override public int hashIngredients() { - return ingredient.hashCode(); + return ingredient.fluid != null ? ingredient.fluid.hashCode() : 0; } @Override diff --git a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java index b593f02be..38c9f59c4 100644 --- a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java @@ -147,7 +147,7 @@ public class PressurizedInput extends MachineInput @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