Skip to content

Commit f878a53

Browse files
committed
ignore block updates / item drops in break manager if they match the rebreak
1 parent 4db79c6 commit f878a53

File tree

1 file changed

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

1 file changed

+6
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ object BreakManager : RequestHandler<BreakRequest>(
133133
.filterNotNull()
134134
.firstOrNull { it.context.expectedPos == event.pos }
135135
?.let { info ->
136+
if (event.pos == ReBreakManager.reBreak?.context?.expectedPos) return@listen
137+
136138
// if not broken
137139
if (!isBroken(info.context.checkedState, event.newState)) {
138140
this@BreakManager.warn("Break at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${info.context.checkedState.brokenState}")
@@ -155,6 +157,10 @@ object BreakManager : RequestHandler<BreakRequest>(
155157
listen<EntityEvent.Update>(priority = Int.MIN_VALUE) {
156158
if (it.entity !is ItemEntity) return@listen
157159

160+
ReBreakManager.reBreak?.let { reBreak ->
161+
if (matchesBlockItem(reBreak, it.entity)) return@listen
162+
}
163+
158164
breakInfos
159165
.filterNotNull()
160166
.firstOrNull { info -> matchesBlockItem(info, it.entity) }

0 commit comments

Comments
 (0)