Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1870 from da3dsoul/6.0.x

Browse source 
Fix isFullFluidBlock -> fix Floodgates
This commit is contained in:
SpaceToad 2014-06-07 18:40:29 +02:00
commit daae576b87
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/core/utils/BlockUtil.java
View file

@ -12,6 +12,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockStaticLiquid;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
@ -26,7 +27,6 @@ import net.minecraft.world.WorldServer;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.fluids.BlockFluidBase;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
@ -146,7 +146,7 @@ public final class BlockUtil {
} }
public static boolean isFullFluidBlock(Block block, World world, int x, int y, int z) { public static boolean isFullFluidBlock(Block block, World world, int x, int y, int z) {
if (block instanceof BlockFluidBase || block instanceof IFluidBlock) { if (block instanceof IFluidBlock || block instanceof BlockStaticLiquid) {
return world.getBlockMetadata(x, y, z) == 0; return world.getBlockMetadata(x, y, z) == 0;
} }
return false; return false;