Skip to content

Commit 49e7302

Browse files
authored
fix(Aimbot): follow point instead of box (#7085)
fixes #6995
1 parent 8feedf4 commit 49e7302

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAimbot.kt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ import net.ccbluex.liquidbounce.event.handler
2626
import net.ccbluex.liquidbounce.features.module.Category
2727
import net.ccbluex.liquidbounce.features.module.ClientModule
2828
import net.ccbluex.liquidbounce.features.module.modules.combat.killaura.KillAuraRequirements
29+
import net.ccbluex.liquidbounce.features.module.modules.render.ModuleDebug
30+
import net.ccbluex.liquidbounce.features.module.modules.render.ModuleDebug.debugGeometry
31+
import net.ccbluex.liquidbounce.render.engine.type.Color4b
2932
import net.ccbluex.liquidbounce.render.renderEnvironmentForWorld
3033
import net.ccbluex.liquidbounce.utils.aiming.RotationTarget
3134
import net.ccbluex.liquidbounce.utils.aiming.data.Rotation
@@ -165,21 +168,24 @@ object ModuleAimbot : ClientModule("Aimbot", Category.COMBAT, aliases = listOf("
165168
}
166169

167170
private fun findNextTargetRotation(): Pair<Entity, RotationWithVector>? {
168-
for (target in targetTracker.targets()) {
171+
for (entity in targetTracker.targets()) {
169172
val eyes = player.eyePos
170-
val pointOnHitbox = pointTracker.findPoint(eyes, target, 0)
171-
val rotationPreference = LeastDifferencePreference(player.rotation, pointOnHitbox.pos)
173+
val point = pointTracker.findPoint(eyes, entity)
172174

173-
val spot = raytraceBox(
174-
eyes,
175-
pointOnHitbox.box,
175+
debugGeometry("Box") { ModuleDebug.DebuggedBox(point.box, Color4b.ORANGE.with(a = 90)) }
176+
debugGeometry("Point") { ModuleDebug.DebuggedPoint(point.pos, Color4b.WHITE, size = 0.1) }
177+
178+
val rotationPreference = LeastDifferencePreference.leastDifferenceToLastPoint(eyes, point.pos)
179+
val rotation = raytraceBox(
180+
eyes = eyes,
181+
box = point.box,
176182
range = targetTracker.maxRange.toDouble(),
177183
wallsRange = 0.0,
178184
rotationPreference = rotationPreference
179185
) ?: continue
180186

181-
targetTracker.target = target
182-
return target to spot
187+
targetTracker.target = entity
188+
return entity to rotation
183189
}
184190

185191
targetTracker.reset()

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/killaura/ModuleKillAura.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ package net.ccbluex.liquidbounce.features.module.modules.combat.killaura
2121

2222
import com.google.gson.JsonObject
2323
import net.ccbluex.liquidbounce.config.types.NamedChoice
24-
import net.ccbluex.liquidbounce.event.waitTicks
2524
import net.ccbluex.liquidbounce.event.events.RotationUpdateEvent
2625
import net.ccbluex.liquidbounce.event.events.SprintEvent
2726
import net.ccbluex.liquidbounce.event.events.WorldRenderEvent
2827
import net.ccbluex.liquidbounce.event.handler
2928
import net.ccbluex.liquidbounce.event.tickHandler
29+
import net.ccbluex.liquidbounce.event.waitTicks
3030
import net.ccbluex.liquidbounce.features.module.Category
3131
import net.ccbluex.liquidbounce.features.module.ClientModule
3232
import net.ccbluex.liquidbounce.features.module.modules.combat.ModuleAutoWeapon
@@ -400,12 +400,10 @@ object ModuleKillAura : ClientModule("KillAura", Category.COMBAT) {
400400
val eyes = player.eyePos
401401
val point = pointTracker.findPoint(eyes, entity)
402402

403-
val pointPos = point.pos
404-
405403
debugGeometry("Box") { ModuleDebug.DebuggedBox(point.box, Color4b.ORANGE.with(a = 90)) }
406-
debugGeometry("Point") { ModuleDebug.DebuggedPoint(pointPos, Color4b.WHITE, size = 0.1) }
404+
debugGeometry("Point") { ModuleDebug.DebuggedPoint(point.pos, Color4b.WHITE, size = 0.1) }
407405

408-
val rotationPreference = LeastDifferencePreference.leastDifferenceToLastPoint(eyes, pointPos)
406+
val rotationPreference = LeastDifferencePreference.leastDifferenceToLastPoint(eyes, point.pos)
409407

410408
// raytrace to the point
411409
val rotation = raytraceBox(

0 commit comments

Comments
 (0)