Fix NPE in Shaft Components

age-series · Aug 6, 2023 · 8577ea8 · 8577ea8
1 parent c59c012
commit 8577ea8
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/kotlin/mods/eln/mechanical/SimpleShaft.kt b/src/main/kotlin/mods/eln/mechanical/SimpleShaft.kt
@@ -202,11 +202,6 @@ abstract class SimpleShaftElement(node: TransparentNode, transparentNodeDescript
     var destructing = false
     override fun isDestructing() = destructing
 
-    init {
-        val exp = WorldExplosion(this as ShaftElement).machineExplosion()
-        slowProcessList.add(createShaftWatchdog(this).setDestroys(exp))
-    }
-
     override val shaftConnectivity: Array<Direction>
         get() = arrayOf(front.left(), front.right())
 
@@ -220,6 +215,8 @@ abstract class SimpleShaftElement(node: TransparentNode, transparentNodeDescript
             // These calls can still change the speed via mergeShaft
             shaft.connectShaft(this, it)
         }
+        val exp = WorldExplosion(this as ShaftElement).machineExplosion()
+        slowProcessList.add(createShaftWatchdog(this).setDestroys(exp))
     }
 
     override fun onBreakElement() {