From a1d1834597cc8ca3dc6787da991e519efcbcd510 Mon Sep 17 00:00:00 2001 From: payonel Date: Tue, 11 May 2021 09:33:36 -0700 Subject: [PATCH] seems onLoaded from ic2 can call oc before traits are ready. this probably closes #3187 --- .../li/cil/oc/common/tileentity/traits/RedstoneAware.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala index 5d58afe55..fdc794773 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala @@ -92,7 +92,10 @@ trait RedstoneAware extends RotationAware with IConnectable with IRedstoneEmitte def getOutput: Array[Int] = ForgeDirection.VALID_DIRECTIONS.map{ side: ForgeDirection => _output(toLocal(side).ordinal) } - def getOutput(side: ForgeDirection) = _output(toLocal(side).ordinal()) + def getOutput(side: ForgeDirection) = Option(_output) match { + case Some(output) => output(toLocal(side).ordinal()) + case _ => 0 + } def setOutput(side: ForgeDirection, value: Int): Boolean = { if (value == getOutput(side)) return false