Skip to content

Commit b94e115

Browse files
committed
set fresh to false for queued requests in request handler and added age checks to rotation requests
1 parent b69a617 commit b94e115

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

common/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ abstract class RequestHandler<R : Request>(
8181
preOpen?.invoke(this)
8282
queuedRequest?.let { request ->
8383
handleRequest(request)
84+
request.fresh = false
8485
queuedRequest = null
8586
}
8687
acceptingRequests = true

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationManager.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ object RotationManager : RequestHandler<RotationRequest>(
7373

7474
init {
7575
listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
76+
activeRequest?.let { request ->
77+
request.age++
78+
}
7679
changedThisTick = false
7780
}
7881

@@ -91,7 +94,7 @@ object RotationManager : RequestHandler<RotationRequest>(
9194
}
9295

9396
override fun SafeContext.handleRequest(request: RotationRequest) {
94-
if (activeRequest != null) return
97+
activeRequest?.let { if (it.age <= 0) return }
9598
if (request.target.targetRotation.value != null) {
9699
activeRequest = request
97100
changedThisTick = true

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationRequest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ data class RotationRequest(
3131
val turnSpeed: () -> Double = { 180.0 },
3232
val speedMultiplier: Double = 1.0
3333
) : Request(prio) {
34+
var age = 0
3435

3536
constructor(
3637
target: RotationTarget,

0 commit comments

Comments
 (0)