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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-04-12 14:35:56 +02:00
commit e4f5574ca8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/common/block/Delegator.scala
View File

@ -1,6 +1,6 @@
package li.cil.oc.common.block
import cpw.mods.fml.common.Optional
import cpw.mods.fml.common.{FMLCommonHandler, Optional}
import cpw.mods.fml.relauncher.{Side, SideOnly}
import java.util
import java.util.Random
@ -342,7 +342,7 @@ class Delegator[Child <: Delegate] extends Block(Material.iron) {
}
}
override def getRenderType = BlockRenderer.getRenderId
override def getRenderType = if (FMLCommonHandler.instance.getEffectiveSide.isClient) BlockRenderer.getRenderId else -1
override def getLightOpacity(world: IBlockAccess, x: Int, y: Int, z: Int) =
subBlock(world, x, y, z) match {