From 512ce5a086f830523f963c445a739816e91f26c5 Mon Sep 17 00:00:00 2001
From: mems01 <70612656+mems01@users.noreply.github.com>
Date: Mon, 24 Feb 2025 21:05:26 +0200
Subject: [PATCH] feat(legacy): KillAura ForceFirstHit option. (#5701)

---
 .../features/module/modules/combat/KillAura.kt | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt
index 395b764955c..c6e28d02950 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt
@@ -259,6 +259,8 @@ object KillAura : Module("KillAura", Category.COMBAT, Keyboard.KEY_R) {
     ) { predictClientMovement != 0 }
     private val predictEnemyPosition by float("PredictEnemyPosition", 1.5f, -1f..2f)
 
+    private val forceFirstHit by boolean("ForceFirstHit", false) { !respectMissCooldown && !useHitDelay }
+
     // Extra swing
     private val failSwing by boolean("FailSwing", true) { swing && options.rotationsActive }
     private val respectMissCooldown by boolean(
@@ -489,7 +491,15 @@ object KillAura : Module("KillAura", Category.COMBAT, Keyboard.KEY_R) {
                 ((distance / distanceFactor.random()) * cpsMultiplier.random()).roundToInt()
             } else 0
 
-            val maxClicks = clicks + extraClicks + generatedClicks
+            var maxClicks = clicks + extraClicks + generatedClicks
+
+            val prevHittable = hittable
+
+            updateHittable()
+
+            if (!prevHittable && hittable && maxClicks == 0 && forceFirstHit) {
+                maxClicks++
+            }
 
             repeat(maxClicks) {
                 val wasBlocking = blockStatus
@@ -562,7 +572,7 @@ object KillAura : Module("KillAura", Category.COMBAT, Keyboard.KEY_R) {
      * Attack enemy
      */
     private fun runAttack(isFirstClick: Boolean, isLastClick: Boolean) {
-        var currentTarget = this.target ?: return
+        val currentTarget = this.target ?: return
 
         val player = mc.thePlayer ?: return
         val world = mc.theWorld ?: return
@@ -575,10 +585,6 @@ object KillAura : Module("KillAura", Category.COMBAT, Keyboard.KEY_R) {
         val multi = targetMode == "Multi"
         val manipulateInventory = simulateClosingInventory && !noInventoryAttack && serverOpenInventory
 
-        updateHittable()
-
-        currentTarget = this.target ?: return
-
         if (hittable && currentTarget.hurtTime > hurtTime) {
             return
         }