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/server/network/WirelessNetwork.scala
This commit is contained in:
Florian Nücke 2015-04-05 19:25:56 +02:00
commit e4bd13f98a
2 changed files with 3 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/server/network/WirelessNetwork.scala
View File

@ -142,7 +142,7 @@ object WirelessNetwork {
val y = (origin.yCoord + v.yCoord * rGap + side.yCoord * rSide + top.yCoord * rTop).toInt
val z = (origin.zCoord + v.zCoord * rGap + side.zCoord * rSide + top.zCoord * rTop).toInt
val blockPos = BlockPosition(x, y, z, world)
Option(world.getBlock(blockPos)) match {
if (world.isBlockLoaded(blockPos)) Option(world.getBlock(blockPos)) match {
case Some(block) => hardness += block.getBlockHardness(blockPos)
case _ =>
}

2
src/main/scala/li/cil/oc/util/ExtendedWorld.scala
View File

@ -62,6 +62,8 @@ object ExtendedWorld {
def setBlockToAir(position: BlockPosition) = world.setBlockToAir(position.toBlockPos)
def isSideSolid(position: BlockPosition, side: EnumFacing) = world.isSideSolid(position.toBlockPos, side)
def isBlockLoaded(position: BlockPosition) = world.isBlockLoaded(position.toBlockPos)
}
}