Skip to content

Commit 9483f60

Browse files
committed
stage checks when cancelling block breaks
1 parent 0a6e7de commit 9483f60

File tree

1 file changed

+3
-1
lines changed
  • common/src/main/kotlin/com/lambda/interaction/request/breaking

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ object BreakManager : RequestHandler<BreakRequest>(
464464
val breakInfo = BreakInfo(requestCtx, Primary, request)
465465
primaryBreak?.let { primaryInfo ->
466466
if (!breakInfo.breakConfig.doubleBreak || secondaryBreak != null) {
467-
if (!primaryInfo.updatedThisTick) {
467+
if (!primaryInfo.updatedThisTick && tickStage in primaryInfo.breakConfig.breakStageMask) {
468468
primaryInfo.cancelBreak()
469469
return@let
470470
} else return null
@@ -475,6 +475,8 @@ object BreakManager : RequestHandler<BreakRequest>(
475475
return secondaryBreak
476476
}
477477

478+
if (tickStage !in primaryInfo.breakConfig.breakStageMask) return null
479+
478480
primaryInfo.stopBreakPacket(world, interaction)
479481
primaryInfo.makeSecondary()
480482
return@let

0 commit comments

Comments
 (0)