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

Fixes #1984.

Browse source
This commit is contained in:
RainWarrior 2016-06-05 11:15:05 +03:00
parent a649cce2ea
commit 883bfe57ab
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
View file

@ -4,6 +4,7 @@ import java.util.Map;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
@ -529,9 +530,10 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
for (int i = 0; i < flow.length; i++) for (int i = 0; i < flow.length; i++)
{ {
if (flow[i] >= 0.875F && end != 1F) if (flow[i] >= 14f / 16)
{ {
end = flow[i]; total += flow[i] * 10;
count += 10;
} }
if (flow[i] >= 0) if (flow[i] >= 0)
@ -563,6 +565,10 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
return 0.875F; return 0.875F;
} }
} }
if (here.getBlock() instanceof BlockLiquid)
{
return Math.min(1 - BlockLiquid.getLiquidHeightPercent(here.getValue(BlockLiquid.LEVEL)), 14f / 16);
}
return !here.getMaterial().isSolid() && up.getBlock() == this ? 1 : this.getQuantaPercentage(world, pos) * 0.875F; return !here.getMaterial().isSolid() && up.getBlock() == this ? 1 : this.getQuantaPercentage(world, pos) * 0.875F;
} }