Skip to content

Commit

Permalink
added combat pause and auto unblock to autopot
Browse files Browse the repository at this point in the history
fixes #1740
  • Loading branch information
1zun4 committed Dec 26, 2023
1 parent 18743d9 commit 1d20d5c
Showing 1 changed file with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemSl
import net.ccbluex.liquidbounce.utils.aiming.Rotation
import net.ccbluex.liquidbounce.utils.aiming.RotationManager
import net.ccbluex.liquidbounce.utils.aiming.RotationsConfigurable
import net.ccbluex.liquidbounce.utils.combat.CombatManager
import net.ccbluex.liquidbounce.utils.combat.shouldBeAttacked
import net.ccbluex.liquidbounce.utils.entity.FallingPlayer
import net.ccbluex.liquidbounce.utils.item.findInventorySlot
Expand Down Expand Up @@ -59,6 +60,7 @@ object ModuleAutoPot : Module("AutoPot", Category.COMBAT) {
private val health by int("Health", 14, 1..19)
private val tillGroundDistance by float("TillGroundDistance", 2f, 1f..5f)
private val doNotBenefitOthers by boolean("DoNotBenefitOthers", true)
private val combatPauseTime by int("CombatPauseTime", 0, 0..40)

private val healthPotion by boolean("HealthPotion", true)
private val regenPotion by boolean("RegenPotion", true)
Expand Down Expand Up @@ -112,10 +114,18 @@ object ModuleAutoPot : Module("AutoPot", Category.COMBAT) {
val collisionBlock = FallingPlayer.fromPlayer(player).findCollision(20)?.pos
val isCloseGround = player.y - (collisionBlock?.y ?: 0) <= tillGroundDistance

if (!isCloseGround || player.isBlocking) {
if (!isCloseGround) {
return false
}

// We need to take some actions
CombatManager.pauseCombatForAtLeast(combatPauseTime)

if (player.isBlocking) {
interaction.stopUsingItem(player)
waitTicks(1)
}

RotationManager.aimAt(
Rotation(player.yaw, (85f..90f).random().toFloat()),
configurable = rotations,
Expand Down

0 comments on commit 1d20d5c

Please sign in to comment.