Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: NotInWater setting in SuperKnockback #4299

Merged
merged 1 commit into from
Nov 4, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ object ModuleSuperKnockback : Module("SuperKnockback", Category.COMBAT, aliases
val hurtTime by int("HurtTime", 10, 0..10)
val chance by int("Chance", 100, 0..100, "%")
val onlyOnGround by boolean("OnlyOnGround", false)
val notInWater by boolean("NotInWater", true)

private object OnlyOnMove : ToggleableConfigurable(this, "OnlyOnMove", true) {
val onlyForward by boolean("OnlyForward", true)
Expand Down Expand Up @@ -170,6 +171,10 @@ object ModuleSuperKnockback : Module("SuperKnockback", Category.COMBAT, aliases
return false
}

if (notInWater && player.isInsideWaterOrBubbleColumn) {
return false
}

if (OnlyOnMove.enabled) {
val isMovingSideways = player.input.movementSideways != 0f
val isMoving = player.input.movementForward != 0f || isMovingSideways
Expand Down
Loading