Skip to content

Commit 5603b69

Browse files
committed
Merge branch '1.21.5' into feature/manager-loggers
2 parents ee5a026 + c03c63a commit 5603b69

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,10 @@ object BreakManager : RequestHandler<BreakRequest>(
496496

497497
val breakInfo = BreakInfo(requestCtx, Primary, request)
498498
primaryBreak?.let { primaryInfo ->
499+
if (tickStage !in primaryInfo.breakConfig.breakStageMask) return null
500+
499501
if (!primaryInfo.breakConfig.doubleBreak || secondaryBreak != null) {
500-
if (!primaryInfo.updatedThisTick && tickStage in primaryInfo.breakConfig.breakStageMask) {
502+
if (!primaryInfo.updatedThisTick) {
501503
primaryInfo.cancelBreak()
502504
return@let
503505
} else return null

0 commit comments

Comments
 (0)