mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Updated FML:
MinecraftForge/FML@9c8ca4a4e3 Unlink banner block and item id. Mojang should of matched these up but they didn't -.- MinecraftForge/FML@84a101f344 Update Dev mcp mappings to 11-30 snapshot.
This commit is contained in:
1 parent
4caf09cd33
commit
59df94bd90
17 files changed
+70
-63
No files matched your search
@@ -135,9 +135,9 @@ public class BlockFluidClassic extends BlockFluidBase
|
||||
}
|
||||
|
||||
// Flow vertically if possible
|
||||
if (canDisplace(world, pos.offsetUp(densityDir)))
|
||||
if (canDisplace(world, pos.up(densityDir)))
|
||||
{
|
||||
flowIntoBlock(world, pos.offsetUp(densityDir), 1);
|
||||
flowIntoBlock(world, pos.up(densityDir), 1);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ public class BlockFluidClassic extends BlockFluidBase
|
||||
|
||||
if (isSourceBlock(world, pos) || !isFlowingVertically(world, pos))
|
||||
{
|
||||
if (world.getBlockState(pos.offsetDown(densityDir)).getBlock() == this)
|
||||
if (world.getBlockState(pos.down(densityDir)).getBlock() == this)
|
||||
{
|
||||
flowMeta = 1;
|
||||
}
|
||||
@@ -165,8 +165,8 @@ public class BlockFluidClassic extends BlockFluidBase
|
||||
|
||||
public boolean isFlowingVertically(IBlockAccess world, BlockPos pos)
|
||||
{
|
||||
return world.getBlockState(pos.offsetUp(densityDir)).getBlock() == this ||
|
||||
(world.getBlockState(pos).getBlock() == this && canFlowInto(world, pos.offsetUp(densityDir)));
|
||||
return world.getBlockState(pos.up(densityDir)).getBlock() == this ||
|
||||
(world.getBlockState(pos).getBlock() == this && canFlowInto(world, pos.up(densityDir)));
|
||||
}
|
||||
|
||||
public boolean isSourceBlock(IBlockAccess world, BlockPos pos)
|
||||
|
||||
Reference in new issue
Block a user