Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

This commit is contained in:
Florian Nücke 2014-07-11 01:16:25 +02:00
commit 68b8df0ef0

View File

@ -43,7 +43,7 @@ class Keyboard extends SimpleBlock(Material.rock) {
}
override def canPlaceBlockOnSide(world: World, x: Int, y: Int, z: Int, side: ForgeDirection) = {
world.isSideSolid(x + side.offsetX, y + side.offsetY, z + side.offsetZ, side) &&
world.isSideSolid(x + side.offsetX, y + side.offsetY, z + side.offsetZ, side.getOpposite) &&
(world.getTileEntity(x + side.offsetX, y + side.offsetY, z + side.offsetZ) match {
case screen: tileentity.Screen => screen.facing != side.getOpposite
case _ => true