rebreak adjustments

Author: beanbag44

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

@@ -94,7 +94,7 @@ object BreakManager : RequestHandler<BreakRequest>(
     TickEvent.Input.Pre,
     TickEvent.Input.Post,
     TickEvent.Player.Post,
-    onOpen = { simulateAbandoned(); processRequest(activeRequest) },
+    onOpen = { processRequest(activeRequest); simulateAbandoned() },
     onClose = { checkForCancels() }
 ), PositionBlocking {
     private var primaryBreak: BreakInfo?

common/src/main/kotlin/com/lambda/interaction/request/breaking/ReBreakManager.kt

@@ -32,13 +32,19 @@ object ReBreakManager {
     var reBreak: BreakInfo? = null
 
     init {
-        listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
-            reBreak?.apply {
-                breakingTicks++
-                tickStats()
+        listen<TickEvent.Pre>(priority = Int.MIN_VALUE) {
+            reBreak?.run {
+                if (!progressedThisTick) {
+                    breakingTicks++
+                    progressedThisTick = true
+                }
             }
         }
 
+        listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
+            reBreak?.tickStats()
+        }
+
         listenUnsafe<ConnectionEvent.Connect.Pre>(priority = Int.MIN_VALUE) {
             reBreak = null
         }
@@ -72,7 +78,7 @@ object ReBreakManager {
             val context = info.context
 
             val breakProgress = context.cachedState.calcBlockBreakingDelta(player, world, context.blockPos)
-            return@runSafe if (info.breakingTicks * breakProgress >= info.breakConfig.breakThreshold) {
+            return@runSafe if ((info.breakingTicks - info.breakConfig.fudgeFactor) * breakProgress >= info.breakConfig.breakThreshold) {
                 if (context.cachedState.isEmpty) {
                     return@runSafe ReBreakResult.Ignored
                 }