Skip to content

Commit e954706

Browse files
committed
small improvements
1 parent 294ed86 commit e954706

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -464,12 +464,10 @@ object BreakManager : RequestHandler<BreakRequest>(
464464

465465
if (!canAccept(ctx)) continue
466466

467-
rotationRequest = if (request.config.rotateForBreak) ctx.rotation.submit(false) else null
468-
if (!rotated || tickStage !in request.config.breakStageMask) return false
469-
470467
val breakInfo = initNewBreak(ctx, request) ?: return false
471468
iterator.remove()
472469
if (!handlePreProcessing()) return false
470+
if (!rotated || tickStage !in request.config.breakStageMask) return false
473471

474472
updateBreakProgress(breakInfo)
475473
}
@@ -516,10 +514,7 @@ object BreakManager : RequestHandler<BreakRequest>(
516514
} else return null
517515
}
518516

519-
if (!primaryInfo.breaking) {
520-
secondaryBreak = breakInfo.apply { type = Secondary }
521-
return secondaryBreak
522-
}
517+
if (!primaryInfo.breaking) return null
523518

524519
secondaryBreak = primaryInfo.apply { type = Secondary }
525520
secondaryBreak?.stopBreakPacket(world, interaction)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ data class SwapInfo(
6161

6262
val minKeepTicks = run {
6363
if (type == Primary) {
64-
val swapTickProgress = breakDelta * (breakTicks + breakConfig.serverSwapTicks - 1)
64+
val swapTickProgress = breakDelta * (breakTicks + breakConfig.serverSwapTicks - 1).coerceAtLeast(1)
6565
if (swapTickProgress >= threshold && swapStack.heldTicks < breakConfig.serverSwapTicks) 1
6666
else 0
6767
} else {
6868
val serverSwapTicks = breakConfig.serverSwapTicks.coerceAtLeast(3)
69-
val swapTickProgress = breakDelta * (breakTicks + serverSwapTicks - 1)
69+
val swapTickProgress = breakDelta * (breakTicks + serverSwapTicks - 1).coerceAtLeast(1)
7070
if (swapTickProgress >= threshold && swapStack.heldTicks < serverSwapTicks) 1
7171
else 0
7272
}

0 commit comments

Comments
 (0)