step held ticks in pre-processing when the current stack is updated

Author: beanbag44

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

@@ -176,9 +176,9 @@ object BreakManager : RequestHandler<BreakRequest>(
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
             if (!swappedThisTick) {
                 currentStack = player.mainHandStack
+                heldTicks++
             }
             swappedThisTick = false
-            heldTicks++
             if (breakCooldown > 0) {
                 breakCooldown--
             }
@@ -430,8 +430,11 @@ object BreakManager : RequestHandler<BreakRequest>(
                         val minSwapTicks = max(info.swapInfo.minKeepTicks, last.swapInfo.minKeepTicks)
                         if (!info.context.requestSwap(info.request, minSwapTicks))
                             return false
-                        if (minSwapTicks > 0)
+                        if (minSwapTicks > 0) {
+                            val alreadySwapped = swappedThisTick
                             currentStack = info.swapStack
+                            if (!alreadySwapped) heldTicks++
+                        }
                     }
                 }
             }

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

@@ -33,7 +33,7 @@ data class SwapInfo(
     val minKeepTicks: Int = 0,
 ) {
     val canCompleteBreak
-        get() = (BreakManager.heldTicks + 1) >= if (type == Primary || type == Rebreak) breakConfig.serverSwapTicks
+        get() = BreakManager.heldTicks >= if (type == Primary || type == Rebreak) breakConfig.serverSwapTicks
         else breakConfig.serverSwapTicks.coerceAtLeast(3)
 
     companion object {