keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge pull request #717 from tommy1019/patch-3

Browse source 
Fixed Fluid Non-Solid Block Duplication
This commit is contained in:
LexManos 2013-08-10 19:47:21 -07:00
commit d304f40295
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/net/minecraftforge/fluids/BlockFluidBase.java
View file

@ -1,4 +1,3 @@
package net.minecraftforge.fluids; package net.minecraftforge.fluids;
import java.util.HashMap; import java.util.HashMap;
@ -130,7 +129,13 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
return false; 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; return true;
} }
@ -171,9 +176,15 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
{ {
return false; return false;
} }
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; return true;
} }

11
common/net/minecraftforge/fluids/BlockFluidClassic.java
View file

@ -1,4 +1,3 @@
package net.minecraftforge.fluids; package net.minecraftforge.fluids;
import java.util.Random; import java.util.Random;
@ -304,9 +303,15 @@ public class BlockFluidClassic extends BlockFluidBase
return false; return false;
} }
if (this.density > getDensity(world, x, y, z)) int density = getDensity(world, x, y, z);
if (density == Integer.MAX_VALUE)
{ {
return true; return true;
}
if (this.density > density)
{
return true;
} }
else else
{ {