From afa6ccd7f35fc80f222b9425ba442c79a17505ac Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 25 Jun 2016 16:03:29 -0700 Subject: [PATCH] Temporarily disable suppression of modded fluids --- .../bloodmagic/item/sigil/ItemSigilSuppression.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index 6dafeb48..3810f596 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.item.sigil; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -9,6 +10,7 @@ import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; +import net.minecraftforge.fluids.BlockFluidBase; public class ItemSigilSuppression extends ItemSigilToggleableBase { @@ -40,8 +42,11 @@ public class ItemSigilSuppression extends ItemSigilToggleableBase BlockPos blockPos = new BlockPos(x + i, y + j, z + k); IBlockState state = world.getBlockState(blockPos); - if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) - TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); + // TODO - Change back when BlockFluidBase overrides getStateFromMeta() + // Temporary fix to avoid liquid duplication + if (state.getBlock() instanceof BlockFluidBase) {/*No-op*/} + else if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) + TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); else { TileEntity tile = world.getTileEntity(blockPos);