should fix OneSetPerTick persistence after break info nullify

Author: beanbag44

src/main/kotlin/com/lambda/interaction/request/breaking/BreakInfo.kt

@@ -48,23 +48,25 @@ data class BreakInfo(
 
     // Pre Processing
     var shouldProgress = false
-    var rebreakPotential by OneSetPerTick(value = RebreakHandler.RebreakPotential.None, throwOnLimitBreach = true)
-    var swapInfo by OneSetPerTick(value = SwapInfo.EMPTY, throwOnLimitBreach = true)
-    var swapStack: ItemStack by OneSetPerTick(ItemStack.EMPTY, true)
+    var rebreakPotential by OneSetPerTick(value = RebreakHandler.RebreakPotential.None, throwOnLimitBreach = true).linkLifetime()
+    var swapInfo by OneSetPerTick(value = SwapInfo.EMPTY, throwOnLimitBreach = true).linkLifetime()
+    var swapStack: ItemStack by OneSetPerTick(ItemStack.EMPTY, true).linkLifetime()
 
     // BreakInfo Specific
-    var updatedThisTick by OneSetPerTick(false, resetAfterTick = true).apply { set(true) }
-    var updatedPreProcessingThisTick by OneSetPerTick(value = false, throwOnLimitBreach = true, resetAfterTick = true)
-    var progressedThisTick by OneSetPerTick(value = false, throwOnLimitBreach = true, resetAfterTick = true)
+    var updatedThisTick by OneSetPerTick(false, resetAfterTick = true).apply { set(true) }.linkLifetime()
+    var updatedPreProcessingThisTick by OneSetPerTick(value = false, throwOnLimitBreach = true, resetAfterTick = true).linkLifetime()
+    var progressedThisTick by OneSetPerTick(value = false, throwOnLimitBreach = true, resetAfterTick = true).linkLifetime()
 
     // Processing
     var breaking = false
     var abandoned = false
-    var breakingTicks by OneSetPerTick(0, true)
-    var soundsCooldown by OneSetPerTick(0f, true)
+    var breakingTicks by OneSetPerTick(0, true).linkLifetime()
+    var soundsCooldown by OneSetPerTick(0f, true).linkLifetime()
     var vanillaInstantBreakable = false
     val rebreakable get() = !vanillaInstantBreakable && type == Primary
 
+    val oneSetPerTickSet = mutableSetOf<OneSetPerTick<*>>()
+
     enum class BreakType(
         override val displayName: String,
         override val description: String
@@ -173,4 +175,7 @@ data class BreakInfo(
     }
 
     override fun toString() = "$type, ${context.cachedState}, ${context.blockPos}"
+
+    private fun <T : Any> OneSetPerTick<T>.linkLifetime() =
+        apply { oneSetPerTickSet.add(this) }
 }

src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -77,6 +77,7 @@ import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
 import com.lambda.util.BlockUtils.isEmpty
 import com.lambda.util.BlockUtils.isNotBroken
 import com.lambda.util.BlockUtils.isNotEmpty
+import com.lambda.util.OneSetPerTick
 import com.lambda.util.extension.partialTicks
 import com.lambda.util.item.ItemUtils.block
 import com.lambda.util.math.lerp
@@ -313,8 +314,8 @@ object BreakManager : RequestHandler<BreakRequest>(
             if (request.fresh) populateFrom(request)
         }
 
-        var noNew = false
-        var noProgression = false
+        var noNew: Boolean
+        var noProgression: Boolean
 
         while (true) {
             noNew = breakRequest?.let { request ->
@@ -639,11 +640,13 @@ object BreakManager : RequestHandler<BreakRequest>(
     /**
      * Nullifies the break. If the block is not broken, the [BreakInfo.internalOnCancel] callback gets triggered
      */
-    private fun BreakInfo.nullify() =
+    private fun BreakInfo.nullify() {
         when (type) {
             Primary, Rebreak -> primaryBreak = null
             else -> secondaryBreak = null
         }
+        oneSetPerTickSet.forEach(OneSetPerTick<*>::destroy)
+    }
 
     /**
      * A modified version of the vanilla updateBlockBreakingProgress method.