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 6114cf5db..1176adcc0 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 net.minecraft.util.math.BlockPos object DriverExportBus extends driver.SidedBlock { override def worksWith(world: World, pos: BlockPos, side: EnumFacing) = world.getTileEntity(pos) match { - case container: IPartHost => EnumFacing.VALUES.map(container.getPart).map(_.getItemStack(PartItemStack.PICK)).exists(AEUtil.isExportBus) + case container: IPartHost => EnumFacing.VALUES.map(container.getPart).filter(obj => { obj != null }).map(_.getItemStack(PartItemStack.PICK)).filter(obj => { obj != null }).exists(AEUtil.isExportBus) 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 c8f38b270..a2638cc36 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/DriverImportBus.scala +++ b/src/main/scala/li/cil/oc/integration/appeng/DriverImportBus.scala @@ -17,7 +17,7 @@ import net.minecraft.world.World object DriverImportBus extends driver.SidedBlock { override def worksWith(world: World, pos: BlockPos, side: EnumFacing) = world.getTileEntity(pos) match { - case container: IPartHost => EnumFacing.VALUES.map(container.getPart).map(_.getItemStack(PartItemStack.PICK)).exists(AEUtil.isImportBus) + case container: IPartHost => EnumFacing.VALUES.map(container.getPart).filter(obj => { obj != null }).map(_.getItemStack(PartItemStack.PICK)).filter(obj => { obj != null }).exists(AEUtil.isImportBus) 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 92423b404..5e0f830f0 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/DriverPartInterface.scala +++ b/src/main/scala/li/cil/oc/integration/appeng/DriverPartInterface.scala @@ -15,7 +15,7 @@ import net.minecraft.world.World object DriverPartInterface extends driver.SidedBlock { override def worksWith(world: World, pos: BlockPos, side: EnumFacing) = world.getTileEntity(pos) match { - case container: IPartHost => EnumFacing.VALUES.map(container.getPart).map(_.getItemStack(PartItemStack.PICK)).exists(AEUtil.isPartInterface) + case container: IPartHost => EnumFacing.VALUES.map(container.getPart).filter(obj => { obj != null }).map(_.getItemStack(PartItemStack.PICK)).filter(obj => { obj != null }).exists(AEUtil.isPartInterface) case _ => false }