From 1a9e13f8803b54c43540fb5b2bf99f4f25b41927 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 10 Mar 2014 23:27:30 -0700 Subject: [PATCH] properly implement equals, sod off Player. --- .../minecraftforge/fluids/FluidContainerRegistry.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java index 05b29c23b7..d31730558b 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java +++ b/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java @@ -57,7 +57,14 @@ public abstract class FluidContainerRegistry @Override public boolean equals(Object o) { - return o != null && o.hashCode() == hashCode(); + if (!(o instanceof ContainerKey)) return false; + ContainerKey ck = (ContainerKey)o; + if (container.getItem() != ck.container.getItem()) return false; + if (container.getItemDamage() != ck.container.getItemDamage()) return false; + if (fluid == null && ck.fluid != null) return false; + if (fluid != null && ck.fluid == null) return false; + if (fluid.fluidID != ck.fluid.fluidID) return false; + return true; } }