From 9e732ee9356daa0843d1265b447806ba046c3d2d Mon Sep 17 00:00:00 2001 From: tommy1019 Date: Thu, 8 Aug 2013 18:38:46 -0500 Subject: [PATCH] Fixed Fluid Non-Solid Block Duplication --- .../minecraftforge/fluids/BlockFluidBase.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/common/net/minecraftforge/fluids/BlockFluidBase.java b/common/net/minecraftforge/fluids/BlockFluidBase.java index 826ec6c07..d96a47e2f 100644 --- a/common/net/minecraftforge/fluids/BlockFluidBase.java +++ b/common/net/minecraftforge/fluids/BlockFluidBase.java @@ -1,4 +1,3 @@ - package net.minecraftforge.fluids; import java.util.HashMap; @@ -130,7 +129,13 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock return false; } - if (this.density > getDensity(world, x, y, z)) + int density = getDensity(world, x, y, z); + if (density == Integer.MAX_VALUE) + { + return true; + } + + if (this.density > density) { return true; } @@ -173,7 +178,14 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock } Block.blocksList[bId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - if (this.density > getDensity(world, x, y, z)) + int density = getDensity(world, x, y, z); + if (density == Integer.MAX_VALUE) + { + Block.blocksList[bId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + return true; + } + + if (this.density > density) { return true; }