corrected break / place manager rotations to show an underlying issue

Author: beanbag44

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

@@ -89,7 +89,8 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
         get() = breakingInfos.mapNotNull { it?.context?.expectedPos } + pendingBreaks.map { it.context.expectedPos }
 
     private var rotation: RotationRequest? = null
-    private var validRotation = false
+    private val validRotation
+        get() = rotation?.done ?: true
 
     private var blockBreakingCooldown = 0
 
@@ -160,7 +161,7 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
             }
 
             requestRotate()
-            if (!validRotation && rotation != null) {
+            if (!validRotation) {
                 postEvent()
                 return@listen
             }
@@ -179,10 +180,6 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
             postEvent()
         }
 
-        listen<UpdateManagerEvent.Rotation.Post>(priority = Int.MIN_VALUE + 1) {
-            validRotation = rotation?.done ?: true
-        }
-
         listen<WorldEvent.BlockUpdate.Server>(priority = Int.MIN_VALUE + 1) { event ->
             pendingBreaks
                 .firstOrNull { it.context.expectedPos == event.pos }

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

@@ -71,7 +71,6 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
     }
 
     private var rotation: RotationRequest? = null
-    private var validRotation = false
 
     private var shouldCrouch = false
 
@@ -125,13 +124,6 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
                     )
                     .take(takeCount)
 
-                rotation = if (placeConfig.rotateForPlace || placeConfig.axisRotate) {
-                    placeContexts.firstOrNull()?.let { ctx ->
-                        if (ctx.rotation.target.angleDistance == 0.0) null
-                        else request.rotationConfig.request(ctx.rotation)
-                    }
-                } else null
-
                 placeContexts.forEach { ctx ->
                     val notSneaking = !player.isSneaking
                     val hotbarRequest = request.hotbarConfig.request(HotbarRequest(ctx.hotbarIndex))
@@ -140,8 +132,9 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
                         postEvent()
                         return@listen
                     }
-                    rotation?.let { rotation ->
-                        if (rotation !== ctx.rotation || !validRotation) {
+                    if ((placeConfig.rotateForPlace || placeConfig.axisRotate)) {
+                        rotation = request.rotationConfig.request(ctx.rotation)
+                        if (!ctx.rotation.target.verify()) {
                             postEvent()
                             return@listen
                         }
@@ -162,10 +155,6 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
             postEvent()
         }
 
-        listen<UpdateManagerEvent.Rotation.Post>(priority = Int.MIN_VALUE) {
-            validRotation = rotation?.done ?: true
-        }
-
         listen<MovementEvent.InputUpdate>(priority = Int.MIN_VALUE) {
             if (shouldCrouch) {
                 shouldCrouch = false

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

@@ -19,7 +19,6 @@ package com.lambda.interaction.request.rotation
 
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.Request
-import com.lambda.interaction.request.rotation.Rotation.Companion.dist
 import com.lambda.interaction.request.rotation.visibilty.RotationTarget
 import com.lambda.threading.runSafe
 
@@ -41,6 +40,6 @@ data class RotationRequest(
 
     override val done: Boolean get() =
         mode == RotationMode.None || runSafe {
-            target.verify(target)
+            target.verify()
         } == true
 }

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

@@ -35,7 +35,7 @@ import com.lambda.util.collections.updatableLazy
  */
 data class RotationTarget(
     val hit: RequestedHit? = null,
-    val verify: RotationTarget.() -> Boolean = { hit?.verifyRotation() ?: true },
+    val verify: () -> Boolean = { hit?.verifyRotation() ?: true },
     private val buildRotation: SafeContext.() -> Rotation?,
 ) {
     val targetRotation = updatableLazy {