Merge pull request #695 from tommy1019/master

Fluid Rendering Fixes
This commit is contained in:
cpw 2013-07-28 02:17:16 -07:00
commit 94045ea73e
2 changed files with 2 additions and 2 deletions

View file

@ -323,7 +323,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
public static double getFlowDirection(IBlockAccess world, int x, int y, int z) public static double getFlowDirection(IBlockAccess world, int x, int y, int z)
{ {
Block block = Block.blocksList[world.getBlockId(x, y, z)]; Block block = Block.blocksList[world.getBlockId(x, y, z)];
if (!(block instanceof BlockFluidBase)) if (world.getBlockMaterial(x, y, z).isLiquid())
{ {
return -1000.0; return -1000.0;
} }

View file

@ -55,7 +55,7 @@ public class RenderBlockFluid implements ISimpleBlockRenderingHandler
{ {
if (world.getBlockId(x, y, z) == block.blockID) if (world.getBlockId(x, y, z) == block.blockID)
{ {
if (world.getBlockId(x, y - block.densityDir, z) == block.blockID) if (world.getBlockMaterial(x, y - block.densityDir, z).isLiquid())
{ {
return 1; return 1;
} }