From 610c5b8fdbd6501d9f19da199a53eb2a76a094b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 24 May 2015 13:57:00 +0200 Subject: [PATCH] Should fix potential NPE in cable rendering. --- .../scala/li/cil/oc/common/block/Cable.scala | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 637402e73..c52b5ddd8 100644 --- a/src/main/scala/li/cil/oc/common/block/Cable.scala +++ b/src/main/scala/li/cil/oc/common/block/Cable.scala @@ -121,13 +121,15 @@ object Cable { case _ => !world.isAirBlock(tpos) }) { val neighborTileEntity = world.getTileEntity(tpos) - val neighborHasNode = hasNetworkNode(neighborTileEntity, side.getOpposite) - val canConnectColor = canConnectBasedOnColor(tileEntity, neighborTileEntity) - val canConnectFMP = !Mods.ForgeMultipart.isAvailable || - (canConnectFromSideFMP(tileEntity, side) && canConnectFromSideFMP(neighborTileEntity, side.getOpposite)) - val canConnectIM = canConnectFromSideIM(tileEntity, side) && canConnectFromSideIM(neighborTileEntity, side.getOpposite) - if (neighborHasNode && canConnectColor && canConnectFMP && canConnectIM) { - result |= (1 << side.getIndex) + if (neighborTileEntity != null && neighborTileEntity.getWorld != null) { + val neighborHasNode = hasNetworkNode(neighborTileEntity, side.getOpposite) + val canConnectColor = canConnectBasedOnColor(tileEntity, neighborTileEntity) + val canConnectFMP = !Mods.ForgeMultipart.isAvailable || + (canConnectFromSideFMP(tileEntity, side) && canConnectFromSideFMP(neighborTileEntity, side.getOpposite)) + val canConnectIM = canConnectFromSideIM(tileEntity, side) && canConnectFromSideIM(neighborTileEntity, side.getOpposite) + if (neighborHasNode && canConnectColor && canConnectFMP && canConnectIM) { + result |= (1 << side.getIndex) + } } } }