hotbar cleanup and small fix

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt

@@ -124,11 +124,12 @@ object HotbarManager : RequestHandler<HotbarRequest>(), Loadable {
         ): Boolean {
             request.swapSlot = SlotInfo(slot, keepTicks, request.hotbarConfig.swapDelay)
             if (slot != currentSlotInfo?.slot) {
-                if (swapsThisTick + 1 > maxSwapsThisTick || swapDelay > 0) return false
+                if (swapsThisTick + 1 > maxSwapsThisTick || swapDelay > 0) {
+                    return false
+                }
 
                 currentSlotInfo?.let { current ->
                     if (current.activeRequestAge == 0 && (current.keepTicks > 0 || current.swapPause > 0)) {
-                        request.failedSwap = true
                         return false
                     }
                 }

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarRequest.kt

@@ -25,12 +25,11 @@ class HotbarRequest(
     priority: Priority = 0,
     val actionSequence: HotbarManager.HotbarActionSequence.() -> Unit,
 ) : Request(priority) {
-    var failedSwap = false
     var swapSlot: HotbarManager.SlotInfo? = null
 
     var instantActionsComplete = false
     override val done: Boolean
-        get() = swapSlot?.let { it.slot == HotbarManager.serverSlot && it.activeRequestAge >= it.swapPause } ?: true
+        get() = swapSlot?.let { it.slot == HotbarManager.serverSlot && it.swapPauseAge >= it.swapPause } ?: true
 
     constructor (
         slot: Int,