idk what i was thinking at 5 am

Author: beanbag44

src/main/kotlin/com/lambda/config/groups/BreakSettings.kt

@@ -51,7 +51,7 @@ class BreakSettings(
     // Fixes / Delays
     override val breakThreshold by c.setting("Break Threshold", 0.70f, 0.1f..1.0f, 0.01f, "The break amount at which the block is considered broken", visibility = vis).group(groupPath, Group.General)
     override val fudgeFactor by c.setting("Fudge Factor", 1, 0..5, 1, "The number of ticks to add to the break time, usually to account for server lag", visibility = vis).group(groupPath, Group.General)
-    override val serverSwapTicks by c.setting("Server Swap", 1, 0..5, 1, "The number of ticks to give the server time to recognize the player attributes on the swapped item", " tick(s)", visibility = vis).group(groupPath, Group.General)
+    override val serverSwapTicks by c.setting("Server Swap", 2, 0..5, 1, "The number of ticks to give the server time to recognize the player attributes on the swapped item", " tick(s)", visibility = vis).group(groupPath, Group.General)
 //    override val desyncFix by c.setting("Desync Fix", false, "Predicts if the players breaking will be slowed next tick as block break packets are processed using the players next position") { vis() && page == Page.General }
     override val breakDelay by c.setting("Break Delay", 0, 0..6, 1, "The delay between breaking blocks", " tick(s)", visibility = vis).group(groupPath, Group.General)
 

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

@@ -32,8 +32,7 @@ data class SwapInfo(
     val minKeepTicks: Int = 0,
 ) {
     val canCompleteBreak
-        get() = BreakManager.heldTicks >= if (type == Primary)
-            breakConfig.serverSwapTicks
+        get() = (BreakManager.heldTicks + 1) >= if (type == Primary) breakConfig.serverSwapTicks
         else breakConfig.serverSwapTicks.coerceAtLeast(2)
 
     companion object {
@@ -58,15 +57,16 @@ data class SwapInfo(
 
             val minKeepTicks = run {
                 if (type == Primary) {
-                    val swapTickProgress = breakDelta * (breakTicks + breakConfig.serverSwapTicks)
+                    val swapTickProgress = breakDelta * (breakTicks + breakConfig.serverSwapTicks - 1)
                     val withoutEfficiency = breakDeltaNoEfficiency * breakTicks >= threshold
-                    if (swapTickProgress >= threshold && !withoutEfficiency && swapStack.heldTicks < breakConfig.serverSwapTicks) 1
+                    if (swapTickProgress >= threshold &&
+                        !withoutEfficiency) 1
                     else 0
                 } else {
-                    val swapTickProgress = breakDelta * (breakTicks + breakConfig.serverSwapTicks.coerceAtLeast(2) - 1)
-                    val withinSecondarySwapRange = swapTickProgress >= threshold ||
-                            (breakDelta * breakTicks >= threshold && breakDelta * (breakTicks - 1) < threshold)
-                    if (withinSecondarySwapRange) 1 else 0
+                    val serverSwapTicks = breakConfig.serverSwapTicks.coerceAtLeast(2)
+                    val swapTickProgress = breakDelta * (breakTicks + serverSwapTicks - 1)
+                    if (swapTickProgress >= threshold && swapStack.heldTicks < serverSwapTicks) 1
+                    else 0
                 }
             }