Merge branch '6.0.x' into 6.1.x

This commit is contained in:
SpaceToad 2014-05-29 14:17:29 +02:00
commit d8d57e822f
2 changed files with 6 additions and 2 deletions
common/buildcraft

View file

@ -10,6 +10,7 @@ package buildcraft.builders;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import buildcraft.BuildCraftBuilders;
@ -54,7 +55,10 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
}
if (marker == null) {
marker = (TileMarker) world.getTileEntity(x, y, z);
TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TileMarker) {
marker = (TileMarker) tile;
}
}
return marker;

View file

@ -163,7 +163,7 @@ public final class BlockUtil {
public static FluidStack drainBlock(Block block, World world, int x, int y, int z, boolean doDrain) {
Fluid fluid = FluidRegistry.lookupFluidForBlock(block);
if (fluid != null) {
if (fluid != null && FluidRegistry.isFluidRegistered(fluid)) {
int meta = world.getBlockMetadata(x, y, z);
if (meta != 0) {