From 6e61b0325bb01c72e56c2fe3debe108334b0dd5a Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Mon, 16 Aug 2021 21:38:33 +0000 Subject: [PATCH 1/2] BusCableBakedModel: Add missing null-check for layer. --- src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java b/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java index 3a3c074a..6e9ced9e 100644 --- a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java +++ b/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java @@ -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(); } From 6b4dbec047163fc70425cf6d4ed1416a952d3c21 Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Mon, 16 Aug 2021 21:50:50 +0000 Subject: [PATCH 2/2] BusCableBlock: Fix crash on dedicated servers. --- src/main/java/li/cil/oc2/common/block/BusCableBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java index 1d48b1c2..cbb3fae2 100644 --- a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java +++ b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java @@ -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);