Skip to content

Commit 1ae9081

Browse files
committed
Merge branch '1.21.5' of https://github.com/Avanatiker/NeoLambda into 1.21.5
2 parents 5a5cf12 + 8b4d87b commit 1ae9081

File tree

1 file changed

+2
-6
lines changed
  • src/main/kotlin/com/lambda/interaction/request/breaking

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,10 @@ data class SwapInfo(
5454

5555
val threshold = getBreakThreshold()
5656

57+
// Plus one as this is calculated before this ticks progress is calculated and the breakingTicks are incremented
5758
val breakTicks = (if (rebreakPotential.isPossible()) RebreakHandler.rebreak?.breakingTicks
5859
?: throw IllegalStateException("Rebreak BreakInfo was null when rebreak was considered possible")
59-
else breakingTicks).let {
60-
// Plus one as this is calculated before this ticks progress is calculated and the breakingTicks are incremented
61-
(it + 1).let {
62-
if (breakDelta >= threshold || !info.breaking) it else (it - breakConfig.fudgeFactor)
63-
}
64-
}
60+
else breakingTicks) + 1 - breakConfig.fudgeFactor
6561

6662
val minKeepTicks = run {
6763
if (type == Primary) {

0 commit comments

Comments
 (0)