From 8b1705f0a0ad5fedc968334e3b9e6632813b7d3e Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Wed, 10 Mar 2021 18:08:57 -0500 Subject: [PATCH] Fix crash when loading Redstone Controller/Emitter from NBT --- .../redstone_controller/RedstoneControllerBlockEntity.kt | 2 +- .../block/redstone_emitter/RedstoneEmitterBlockEntity.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt index 07df638..1640ddf 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt @@ -28,7 +28,7 @@ class RedstoneControllerBlockEntity: DeviceBlockEntity(PhyBlockEntities.REDSTONE } fun redstoneStateChanged() { - if (world!!.isClient) return + if (world == null || world!!.isClient) return val oldPowered = redstonePowered redstonePowered = cachedState[RedstoneControllerBlock.POWERED] diff --git a/src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterBlockEntity.kt index 077e1fd..0329d43 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterBlockEntity.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterBlockEntity.kt @@ -67,8 +67,8 @@ class RedstoneEmitterBlockEntity: DeviceBlockEntity(PhyBlockEntities.REDSTONE_EM } private fun recalculateRedstone() { - if (world!!.isClient) return - + if (world == null || world!!.isClient) return + if (stackToMonitor.isEmpty) { cachedEmittedPower = 0 updateWorld()