Don't remove splicing table during upgrade (fix #47)

object-Object · object-Object · commit 5a0f3bcfc1ea · 2025-09-25T18:30:11.000-04:00
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/blocks/splicing/SplicingTableBlock.kt b/Common/src/main/kotlin/gay/object/hexdebug/blocks/splicing/SplicingTableBlock.kt
@@ -79,12 +79,13 @@ class SplicingTableBlock(properties: Properties, val enlightened: Boolean) : Bas
         newState: BlockState,
         movedByPiston: Boolean
     ) {
-        if (state.block != newState.block) {
+        // don't drop contents or remove block entity during a table upgrade
+        if (newState.block !is SplicingTableBlock) {
             getBlockEntity(level, pos)?.let {
                 Containers.dropContents(level, pos, it)
             }
+            super.onRemove(state, level, pos, newState, movedByPiston)
         }
-        super.onRemove(state, level, pos, newState, movedByPiston)
     }
 
     override fun hasAnalogOutputSignal(state: BlockState) = true

Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,13 @@ class SplicingTableBlock(properties: Properties, val enlightened: Boolean) : Bas`
`79`	`79`	`newState: BlockState,`
`80`	`80`	`movedByPiston: Boolean`
`81`	`81`	`) {`
`82`		`- if (state.block != newState.block) {`
	`82`	`+ // don't drop contents or remove block entity during a table upgrade`
	`83`	`+ if (newState.block !is SplicingTableBlock) {`
`83`	`84`	`getBlockEntity(level, pos)?.let {`
`84`	`85`	`Containers.dropContents(level, pos, it)`
`85`	`86`	`}`
	`87`	`+ super.onRemove(state, level, pos, newState, movedByPiston)`
`86`	`88`	`}`
`87`		`- super.onRemove(state, level, pos, newState, movedByPiston)`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`override fun hasAnalogOutputSignal(state: BlockState) = true`