LEGACY: Minor Changes (CCBlueX#2744)

- Added "None" option to KillAura Mark. - Minor fix in AutoDisable.
EclipsesDev · Apr 8, 2024 · fb8d3fd · fb8d3fd
1 parent 85552a0
commit fb8d3fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 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
@@ -268,7 +268,7 @@ object KillAura : Module("KillAura", ModuleCategory.COMBAT, Keyboard.KEY_R) {
     )
 
     // Visuals
-    private val mark by ListValue("Mark", arrayOf("Platform", "Box"), "Platform", subjective = true)
+    private val mark by ListValue("Mark", arrayOf("None", "Platform", "Box"), "Platform", subjective = true)
     private val boxOutline by BoolValue("Outline", true, subjective = true) { mark == "Box" }
     private val fakeSharp by BoolValue("FakeSharp", true, subjective = true)
 
@@ -422,21 +422,22 @@ object KillAura : Module("KillAura", ModuleCategory.COMBAT, Keyboard.KEY_R) {
 
         target ?: return
 
+        if (attackTimer.hasTimePassed(attackDelay)) {
+            if (maxCPS > 0)
+                clicks++
+            attackTimer.reset()
+            attackDelay = randomClickDelay(minCPS, maxCPS)
+        }
+
         val hittableColor = if (hittable) Color(37, 126, 255, 70) else Color(255, 0, 0, 70)
 
         if (targetMode != "Multi") {
             when (mark.lowercase()) {
+                "none" -> return
                 "platform" -> drawPlatform(target!!, hittableColor)
                 "box" -> drawEntityBox(target!!, hittableColor, boxOutline)
             }
         }
-
-        if (attackTimer.hasTimePassed(attackDelay)) {
-            if (maxCPS > 0)
-                clicks++
-            attackTimer.reset()
-            attackDelay = randomClickDelay(minCPS, maxCPS)
-        }
     }
 
     /**

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/misc/AutoDisable.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/misc/AutoDisable.kt
@@ -51,10 +51,6 @@ object AutoDisable : Module("AutoDisable", ModuleCategory.MISC, gameDetecting =
 
     @EventTarget
     fun onWorld(event: WorldEvent) {
-        if (mc.thePlayer == null) {
-            return
-        }
-
         if (onWorldChange) {
             disabled("world changed")
         }