From b4b341d2c996d0e4554b2d11a0e31ef45922975f Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 7 Jun 2016 22:12:04 -0700 Subject: [PATCH] Stop potions from being looked up as water containers --- src/main/java/mezz/jei/gui/Focus.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/mezz/jei/gui/Focus.java b/src/main/java/mezz/jei/gui/Focus.java index c5eec635b..cd3eaadd0 100644 --- a/src/main/java/mezz/jei/gui/Focus.java +++ b/src/main/java/mezz/jei/gui/Focus.java @@ -15,6 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -58,6 +59,11 @@ private static Fluid getFluidFromItemStack(@Nonnull ItemStack stack) { } } + // workaround for broken FluidContainerRegistry entry for potions + if (item instanceof ItemPotion) { + return null; + } + FluidStack fluidContained = FluidUtil.getFluidContained(stack); if (fluidContained != null) { Fluid fluid = fluidContained.getFluid();