diff --git a/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala b/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala index e046c139d..289b080e8 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala +++ b/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala @@ -28,7 +28,7 @@ import scala.collection.convert.WrapAsScala._ object DriverExportBus extends driver.SidedBlock { override def worksWith(world: World, x: Int, y: Int, z: Int, side: ForgeDirection) = world.getTileEntity(x, y, z) match { - case container: IPartHost => ForgeDirection.VALID_DIRECTIONS.map(container.getPart).exists(_.isInstanceOf[PartExportBus]) + case container: IPartHost => ForgeDirection.VALID_DIRECTIONS.map(container.getPart).filter(obj => { obj != null }).exists(_.isInstanceOf[PartExportBus]) case _ => false } diff --git a/src/main/scala/li/cil/oc/integration/appeng/DriverImportBus.scala b/src/main/scala/li/cil/oc/integration/appeng/DriverImportBus.scala index 1b55486dc..0a9185001 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/DriverImportBus.scala +++ b/src/main/scala/li/cil/oc/integration/appeng/DriverImportBus.scala @@ -16,7 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection object DriverImportBus extends driver.SidedBlock { override def worksWith(world: World, x: Int, y: Int, z: Int, side: ForgeDirection) = world.getTileEntity(x, y, z) match { - case container: IPartHost => ForgeDirection.VALID_DIRECTIONS.map(container.getPart).exists(_.isInstanceOf[PartImportBus]) + case container: IPartHost => ForgeDirection.VALID_DIRECTIONS.map(container.getPart).filter(obj => { obj != null }).exists(_.isInstanceOf[PartImportBus]) case _ => false } diff --git a/src/main/scala/li/cil/oc/integration/appeng/DriverPartInterface.scala b/src/main/scala/li/cil/oc/integration/appeng/DriverPartInterface.scala index 52e519230..d997c3a9c 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/DriverPartInterface.scala +++ b/src/main/scala/li/cil/oc/integration/appeng/DriverPartInterface.scala @@ -16,7 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection object DriverPartInterface extends driver.SidedBlock { override def worksWith(world: World, x: Int, y: Int, z: Int, side: ForgeDirection) = world.getTileEntity(x, y, z) match { - case container: IPartHost => ForgeDirection.VALID_DIRECTIONS.map(container.getPart).exists(_.isInstanceOf[PartInterface]) + case container: IPartHost => ForgeDirection.VALID_DIRECTIONS.map(container.getPart).filter(obj => { obj != null }).exists(_.isInstanceOf[PartInterface]) case _ => false }