Target override command

Luna5ama · Sep 12, 2023 · a92a0c2 · a92a0c2
1 parent c618e8e
commit a92a0c2
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 4 deletions.
diff --git a/src/main/kotlin/dev/luna5ama/trollhack/command/commands/TargetCommand.kt b/src/main/kotlin/dev/luna5ama/trollhack/command/commands/TargetCommand.kt
@@ -0,0 +1,38 @@
+package dev.luna5ama.trollhack.command.commands
+
+import dev.luna5ama.trollhack.command.ClientCommand
+import dev.luna5ama.trollhack.manager.managers.CombatManager
+import dev.luna5ama.trollhack.util.text.NoSpamMessage
+import java.lang.ref.WeakReference
+
+object TargetCommand : ClientCommand(
+    name = "target",
+    alias = arrayOf(),
+    description = "Override combat target"
+) {
+    init {
+        player("player") { playerArg ->
+            executeSafe {
+                val targetPlayer = playerArg.value
+                if (targetPlayer.name == player.name) {
+                    NoSpamMessage.sendError(TargetCommand, "You can't target yourself!")
+                    return@executeSafe
+                }
+
+                val target = world.getPlayerEntityByName(targetPlayer.name)
+                if (target == null) {
+                    NoSpamMessage.sendError(TargetCommand, "Player ${targetPlayer.name} not found!")
+                    return@executeSafe
+                }
+
+                CombatManager.targetOverride = WeakReference(target)
+                NoSpamMessage.sendMessage("Targeting ${targetPlayer.name}")
+            }
+        }
+
+        executeSafe {
+            CombatManager.targetOverride = null
+            NoSpamMessage.sendMessage("Target override cleared")
+        }
+    }
+}
diff --git a/src/main/kotlin/dev/luna5ama/trollhack/manager/managers/CombatManager.kt b/src/main/kotlin/dev/luna5ama/trollhack/manager/managers/CombatManager.kt
@@ -44,6 +44,7 @@ import net.minecraft.network.play.server.*
 import net.minecraft.util.SoundCategory
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Vec3d
+import java.lang.ref.WeakReference
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.max
@@ -58,6 +59,7 @@ object CombatManager : Manager() {
     private val hurtTimeMap = Int2LongMaps.synchronize(Int2LongOpenHashMap()).apply { defaultReturnValue(-1L) }
     private val healthMap = Int2FloatMaps.synchronize(Int2FloatOpenHashMap()).apply { defaultReturnValue(Float.NaN) }
 
+    var targetOverride: WeakReference<EntityLivingBase>? = null
     var target: EntityLivingBase? = null
         get() {
             if (field?.isEntityAlive == false) {

diff --git a/src/main/kotlin/dev/luna5ama/trollhack/module/modules/combat/CombatSetting.kt b/src/main/kotlin/dev/luna5ama/trollhack/module/modules/combat/CombatSetting.kt
@@ -5,6 +5,7 @@ import dev.fastmc.common.TimeUnit
 import dev.fastmc.common.ceilToInt
 import dev.fastmc.common.sq
 import dev.luna5ama.trollhack.event.SafeClientEvent
+import dev.luna5ama.trollhack.event.events.ConnectionEvent
 import dev.luna5ama.trollhack.event.events.RunGameLoopEvent
 import dev.luna5ama.trollhack.event.events.TickEvent
 import dev.luna5ama.trollhack.event.events.render.Render2DEvent
@@ -205,6 +206,10 @@ internal object CombatSetting : Module(
     override fun isActive() = KillAura.isActive() || BedAura.isActive() || TrollAura.isActive() || Surround.isActive()
 
     init {
+        listener<ConnectionEvent.Disconnect> {
+            CombatManager.targetOverride = null
+        }
+
         listener<RenderEntityEvent.Model.Pre> {
             if (it.cancelled || !chams || it.entity != CombatManager.target) return@listener
 
@@ -286,15 +291,22 @@ internal object CombatSetting : Module(
             overrideRange = if (it is KillAura) it.range else targetRange
         }
 
+        val overrideTarget = CombatManager.targetOverride?.get()
+
         val eyePos = player.eyePosition
         val ignoreWall = shouldIgnoreWall()
         val set = getTargetList()
 
         val wallRangeSq = wallRange.sq
-        val newTarget = set.firstOrNull {
-            (overrideRange == targetRange || it.distanceTo(eyePos) < overrideRange)
-                && (ignoreWall || (player.canEntityBeSeen(it) && player.distanceSqTo(it) <= wallRangeSq))
-        }
+        val newTarget =
+            if (overrideTarget != null && overrideTarget.distanceTo(eyePos) < overrideRange) {
+                overrideTarget
+            } else {
+                set.firstOrNull {
+                    (overrideRange == targetRange || it.distanceTo(eyePos) < overrideRange)
+                        && (ignoreWall || (player.canEntityBeSeen(it) && player.distanceSqTo(it) <= wallRangeSq))
+                }
+            }
         val tracker = CombatManager.trackerTarget?.takeIf { it.entity === newTarget }
             ?: newTarget?.let { MotionTracker(it) }