AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 09:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
This commit is contained in:
Florian Nücke 2015-06-13 02:06:39 +02:00
commit 4f759c2c49
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/block/ServerRack.scala
View File

@ -21,7 +21,7 @@ class ServerRack extends RedstoneAware with traits.PowerAcceptor with traits.Rot
override def getMixedBrightnessForBlock(world: IBlockAccess, pos: BlockPos) = {
if (pos.getY >= 0 && pos.getY < 256) world.getTileEntity(pos) match {
case rack: tileentity.ServerRack =>
def brightness(pos: BlockPos) = world.getCombinedLight(pos, getLightValue(world, pos))
def brightness(pos: BlockPos) = world.getCombinedLight(pos, world.getBlockState(pos).getBlock.getLightValue(world, pos))
val value = brightness(pos.offset(rack.facing))
val skyBrightness = (value >> 20) & 15
val blockBrightness = (value >> 4) & 15