From 90bcce8ea99cb86cd735b970385124798cfb56eb Mon Sep 17 00:00:00 2001
From: DStrand1 <dane@strandboge.com>
Date: Tue, 25 May 2021 01:50:24 -0500
Subject: [PATCH] Fix CME from accessing world in onLoad

---
 .../gregtech/api/metatileentity/MetaTileEntity.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 72baac580a..4ec38789b2 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -484,10 +484,6 @@ public boolean shouldRenderBackSide() {
     }
 
     public void onLoad() {
-        this.cachedComparatorValue = getActualComparatorValue();
-        for (EnumFacing side : EnumFacing.VALUES) {
-            this.sidedRedstoneInput[side.getIndex()] = GTUtility.getRedstonePower(getWorld(), getPos(), side);
-        }
     }
 
     public void onUnload() {
@@ -582,6 +578,14 @@ private void updateLightValue() {
     }
 
     public void update() {
+
+        if (getTimer() == 0L) {
+            this.cachedComparatorValue = getActualComparatorValue();
+            for (EnumFacing side : EnumFacing.VALUES) {
+                this.sidedRedstoneInput[side.getIndex()] = GTUtility.getRedstonePower(getWorld(), getPos(), side);
+            }
+        }
+
         for (MTETrait mteTrait : this.mteTraits) {
             if (shouldUpdate(mteTrait)) {
                 mteTrait.update();