fixed regression in fluid interaction caused by suffocation fix (fixes …

…#6)
benblank · Mar 6, 2016 · 588f4be · 588f4be
1 parent ee4cf1b
commit 588f4be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/com/five35/minecraft/ice/DeathMarkerBlock.java b/src/main/java/com/five35/minecraft/ice/DeathMarkerBlock.java
@@ -61,11 +61,21 @@ public int getRenderType() {
 		return -1;
 	}
 
+	@Override
+	public boolean isFullCube() {
+		return false;
+	}
+
 	@Override
 	public boolean isOpaqueCube() {
 		return false;
 	}
 
+	@Override
+	public boolean isPassable(IBlockAccess world, BlockPos position) {
+		return true;
+	}
+
 	@Override
 	public boolean onBlockActivated(final World world, final BlockPos position, final IBlockState state, final EntityPlayer player, final EnumFacing side, final float xOffset, final float yOffset, final float zOffset) {
 		if (world.isRemote) {

diff --git a/src/main/java/com/five35/minecraft/ice/DeathMarkerMaterial.java b/src/main/java/com/five35/minecraft/ice/DeathMarkerMaterial.java
@@ -21,11 +21,6 @@ public boolean blocksLight() {
 		return false;
 	}
 
-	@Override
-	public boolean blocksMovement() {
-		return false;
-	}
-
 	@Override
 	public boolean isSolid() {
 		return false;