mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +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
@@ -369,7 +369,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
public int getMixedBrightnessForBlock(IBlockAccess world, BlockPos pos)
|
||||
{
|
||||
int lightThis = world.getCombinedLight(pos, 0);
|
||||
int lightUp = world.getCombinedLight(pos.offsetUp(), 0);
|
||||
int lightUp = world.getCombinedLight(pos.up(), 0);
|
||||
int lightThisBase = lightThis & 255;
|
||||
int lightUpBase = lightUp & 255;
|
||||
int lightThisExt = lightThis >> 16 & 255;
|
||||
@@ -478,7 +478,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
{
|
||||
if (!world.getBlockState(pos2).getBlock().getMaterial().blocksMovement())
|
||||
{
|
||||
otherDecay = quantaPerBlock - getQuantaValue(world, pos2.offsetDown());
|
||||
otherDecay = quantaPerBlock - getQuantaValue(world, pos2.down());
|
||||
if (otherDecay >= 0)
|
||||
{
|
||||
int power = otherDecay - (decay - quantaPerBlock);
|
||||
@@ -493,7 +493,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
}
|
||||
}
|
||||
|
||||
if (world.getBlockState(pos.offsetUp()).getBlock() == this)
|
||||
if (world.getBlockState(pos.up()).getBlock() == this)
|
||||
{
|
||||
boolean flag =
|
||||
isBlockSolid(world, pos.add( 0, 0, -1), EnumFacing.NORTH) ||
|
||||
|
||||
Reference in new issue
Block a user