Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #60 from AmandaCameron/bus-fixes

Browse Source 
a couple of Bus fixes
This commit is contained in:
Sangar
2021-08-22 21:19:15 +02:00
committed by GitHub
parent 3bd0cb3641 6b4dbec047
commit b239df7777
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java
View File

@@ -65,7 +65,7 @@ public final class BusCableBakedModel implements IDynamicBakedModel {
}
}
if (state == null || !state.getValue(BusCableBlock.HAS_CABLE) || !layer.equals(RenderType.solid())) {
if (state == null || !state.getValue(BusCableBlock.HAS_CABLE) || layer == null || !layer.equals(RenderType.solid())) {
return Collections.emptyList();
}

2
src/main/java/li/cil/oc2/common/block/BusCableBlock.java
View File

@@ -244,7 +244,7 @@ public final class BusCableBlock extends Block {
return ActionResultType.sidedSuccess(world.isClientSide());
}
}
} else {
} else if (world.isClientSide()) {
final Direction side = getHitSide(pos, hit);
if (getConnectionType(state, side) == ConnectionType.INTERFACE) {
openBusInterfaceScreen(busCableTileEntity, side);