dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add null checks in BlockCable, fixes #651

Browse Source
This commit is contained in:
way2muchnoise
2016-11-23 14:38:16 +01:00
parent 845c812827
commit 3714ee3abf
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
View File

@@ -134,13 +134,14 @@ public class BlockCable extends BlockCoverable {
.withProperty(DOWN, hasConnectionWith(world, pos, EnumFacing.DOWN)); .withProperty(DOWN, hasConnectionWith(world, pos, EnumFacing.DOWN));
TileNode tile = (TileNode) world.getTileEntity(pos); TileNode tile = (TileNode) world.getTileEntity(pos);
if (tile != null) {
if (getPlacementType() != null) {
state = state.withProperty(DIRECTION, tile.getDirection());
}
if (getPlacementType() != null) { if (hasConnectivityState()) {
state = state.withProperty(DIRECTION, tile.getDirection()); state = state.withProperty(CONNECTED, tile.isConnected());
} }
if (hasConnectivityState()) {
state = state.withProperty(CONNECTED, tile.isConnected());
} }
return state; return state;
@@ -152,7 +153,8 @@ public class BlockCable extends BlockCoverable {
boolean isConnectable = API.instance().getConnectableConditions().stream().anyMatch(p -> p.test(facing)); boolean isConnectable = API.instance().getConnectableConditions().stream().anyMatch(p -> p.test(facing));
if (isConnectable) { if (isConnectable) {
// Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage heads). // Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage heads).
if (getPlacementType() != null && ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() == facing) { TileMultipartNode multipartNode = ((TileMultipartNode) world.getTileEntity(pos));
if (getPlacementType() != null && multipartNode != null && multipartNode.getFacingTile() == facing) {
return false; return false;
} }