From 6f1c913a900d3b39eadc869d7b9b2679d10d94a3 Mon Sep 17 00:00:00 2001 From: payonel Date: Wed, 21 Feb 2018 20:27:02 -0800 Subject: [PATCH] fix compile error of merge --- src/main/scala/li/cil/oc/common/block/Cable.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/block/Cable.scala b/src/main/scala/li/cil/oc/common/block/Cable.scala index 3eb55e22b..68c0b2950 100644 --- a/src/main/scala/li/cil/oc/common/block/Cable.scala +++ b/src/main/scala/li/cil/oc/common/block/Cable.scala @@ -144,13 +144,13 @@ object Cable { def parts(world: IBlockAccess, pos: BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB]) = { 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) for (side <- EnumFacing.VALUES) { if(((1 << side.getIndex) & mask) != 0) { val part = Cable.CachedParts(side.ordinal()).offset(pos) - if (entityBox.intersects(part)) boxes.add(part) + if (entityBox.intersectsWith(part)) boxes.add(part) } } }