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

fix compile error of merge

Browse Source
This commit is contained in:
payonel 2018-02-21 20:27:02 -08:00
parent f73da4553a
commit 6f1c913a90
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/Cable.scala
View File

@ -144,13 +144,13 @@ object Cable {
def parts(world: IBlockAccess, pos: BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB]) = { def parts(world: IBlockAccess, pos: BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB]) = {
val center = Cable.DefaultBounds.offset(pos) val center = Cable.DefaultBounds.offset(pos)
if (entityBox.intersects(center)) boxes.add(center) if (entityBox.intersectsWith(center)) boxes.add(center)
val mask = Cable.neighbors(world, pos) val mask = Cable.neighbors(world, pos)
for (side <- EnumFacing.VALUES) { for (side <- EnumFacing.VALUES) {
if(((1 << side.getIndex) & mask) != 0) { if(((1 << side.getIndex) & mask) != 0) {
val part = Cable.CachedParts(side.ordinal()).offset(pos) val part = Cable.CachedParts(side.ordinal()).offset(pos)
if (entityBox.intersects(part)) boxes.add(part) if (entityBox.intersectsWith(part)) boxes.add(part)
} }
} }
} }