keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix FluidContainerRegistry handling potions as water bottles (#3037)

Browse source
This commit is contained in:
mezz 2016-06-26 12:18:11 -07:00 committed by LexManos
parent 99616a503f
commit 1871cf1b02
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java
View file

@ -74,6 +74,7 @@ public abstract class FluidContainerRegistry
ContainerKey ck = (ContainerKey)o; ContainerKey ck = (ContainerKey)o;
if (container.getItem() != ck.container.getItem()) return false; if (container.getItem() != ck.container.getItem()) return false;
if (container.getItemDamage() != ck.container.getItemDamage()) return false; if (container.getItemDamage() != ck.container.getItemDamage()) return false;
if (!ItemStack.areItemStackTagsEqual(container, ck.container)) return false;
if (fluid == null && ck.fluid != null) return false; if (fluid == null && ck.fluid != null) return false;
if (fluid != null && ck.fluid == null) return false; if (fluid != null && ck.fluid == null) return false;
if (fluid == null && ck.fluid == null) return true; if (fluid == null && ck.fluid == null) return true;