Skip to content

Commit

Permalink
Stop potions from being looked up as water containers
Browse files Browse the repository at this point in the history
  • Loading branch information
mezz committed Jun 8, 2016
1 parent 95a3997 commit b4b341d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/main/java/mezz/jei/gui/Focus.java
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit b4b341d

Please sign in to comment.