Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-02-08 14:55:27 +00:00
commit ac39b6fabe
78 files changed
+1059 -905

No files matched your search

@@ -394,7 +394,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
@Override
public int getLightValue(IBlockAccess world, BlockPos pos)
{
if(general.enableAmbientLighting)
if(client.enableAmbientLighting)
{
TileEntity tileEntity = world.getTileEntity(pos);
@@ -402,7 +402,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
{
if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate())
{
return general.ambientLightingLevel;
return client.ambientLightingLevel;
}
}
}