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

Merge branch 'BuildCraft-5.1.x' into NextGen

Browse source 
Conflicts:
	common/buildcraft/core/utils/BlockUtil.java
This commit is contained in:
SpaceToad 2014-04-10 08:46:42 +02:00
commit 30df91675e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ public class BlockUtil {
} }
public static boolean isSoftBlock(Block block, IBlockAccess world, int x, int y, int z) { public static boolean isSoftBlock(Block block, IBlockAccess world, int x, int y, int z) {
return block == null || BuildCraftAPI.softBlocks.contains(block) || block.isAir(world, x, y, z); return block == null || BuildCraftAPI.softBlocks.contains(block) || block.isReplaceable(world, x, y, z) || block.isAir(world, x, y, z);
} }
public static boolean isUnbreakableBlock(World world, int x, int y, int z) { public static boolean isUnbreakableBlock(World world, int x, int y, int z) {