Skip to content

Commit aa92241

Browse files
committed
cleanup and fixed small newBreaks issue
1 parent 3a1352e commit aa92241

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -285,22 +285,24 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
285285

286286
private fun refreshOrCancelBreaks(newContexts: MutableCollection<BreakContext>, request: BreakRequest) {
287287
breakInfos
288-
.forEachNotNull { info ->
288+
.filterNotNull()
289+
.forEach { info ->
289290
newContexts.find { ctx -> ctx.expectedPos == info.context.expectedPos }?.let { ctx ->
290291
info.updateInfo(ctx, request)
291292
newContexts.remove(ctx)
292-
return@forEachNotNull
293+
return@forEach
293294
}
294295

295296
info.cancelBreak()
296297
}
297298
}
298299

299-
private fun SafeContext.processNewBreaks(newBreaks: Collection<BreakContext>, request: BreakRequest) {
300+
private fun SafeContext.processNewBreaks(newBreaks: MutableCollection<BreakContext>, request: BreakRequest) {
300301
newBreaks
301302
.filter { !it.instantBreak }
302303
.forEach { ctx ->
303304
handleNewBreak(ctx, request) ?: return
305+
newBreaks.remove(ctx)
304306
request.onAccept?.invoke(ctx.expectedPos)
305307
if (atMaxBreakInfos(request.buildConfig.breakSettings)) return
306308
}
@@ -365,7 +367,7 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
365367
}
366368

367369
private fun setPendingBreaksLimits(buildConfig: BuildConfig) {
368-
pendingBreaks.setMaxSize(buildConfig.breakSettings.maxPendingBreaks)
370+
pendingBreaks.setSizeLimit(buildConfig.breakSettings.maxPendingBreaks)
369371
pendingBreaks.setDecayTime(buildConfig.interactionTimeout * 50L)
370372
}
371373

@@ -621,10 +623,6 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
621623
else -> secondaryBreak = null
622624
}
623625

624-
private fun Array<BreakInfo?>.forEachNotNull(block: (BreakInfo) -> Unit) {
625-
for (info in this) info?.run(block)
626-
}
627-
628626
override fun preEvent() = UpdateManagerEvent.Break.Pre().post()
629627
override fun postEvent() = UpdateManagerEvent.Break.Post().post()
630628
}

common/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
176176
val placeConfig = request.buildConfig.placeSettings
177177

178178
if (tickPre) {
179-
pendingPlacements.setMaxSize(placeConfig.maxPendingPlacements)
179+
pendingPlacements.setSizeLimit(placeConfig.maxPendingPlacements)
180180
pendingPlacements.setDecayTime(request.buildConfig.interactionTimeout * 50L)
181181

182182
val isSneaking = player.isSneaking

0 commit comments

Comments
 (0)