Add UsingItem-OnlyOnNoSlow in sprint

SkidBounce · Jul 30, 2024 · edac39e · edac39e
1 parent 99cda04
commit edac39e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/NoSlow.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/NoSlow.kt
@@ -197,8 +197,8 @@ object NoSlow : Module("NoSlow", MOVEMENT, gameDetecting = false) {
         if (!noMoveCheck) usedMode.onPacket(event)
     }
 
-    private fun doNoSlow(noSlowItem: NoSlowItem): Boolean {
-        if (noSlowItem == OTHER)
+    fun doNoSlow(noSlowItem: NoSlowItem = NoSlow.noSlowItem): Boolean {
+        if (noSlowItem == OTHER || !handleEvents())
             return false
 
         val mode = usedMode

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Sprint.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Sprint.kt
@@ -44,6 +44,7 @@ object Sprint : Module("Sprint", MOVEMENT, gameDetecting = false) {
     private val blindness by BooleanValue("Blindness", true)
     private val sneaking by BooleanValue("Sneaking", true)
     private val usingItem by BooleanValue("UsingItem", true)
+    private val usingItemOnlyNoSlow by BooleanValue("UsingItem-OnlyOnNoSlow", true) { usingItem }
     private val inventory by BooleanValue("Inventory", true)
     private val hunger by BooleanValue("Hunger", false)
 
@@ -128,12 +129,12 @@ object Sprint : Module("Sprint", MOVEMENT, gameDetecting = false) {
     private fun shouldStopSprinting(movementInput: MovementInput, isUsingItem: Boolean): Boolean {
         mc.thePlayer ?: return false
 
-        if ((!usingItem && isUsingItem)
-            || (!inventory && serverOpenInventory)
-            || (!sneaking && mc.thePlayer.isSneaking)
-            || (!collide && mc.thePlayer.isCollidedHorizontally)
-            || (!blindness && mc.thePlayer.isPotionActive(Potion.blindness) && !mc.thePlayer.isSprinting)
-            || (!hunger && !(mc.thePlayer.foodStats.foodLevel > 6f || mc.thePlayer.capabilities.allowFlying))
+        if (isUsingItem && (!usingItem || usingItemOnlyNoSlow && !NoSlow.doNoSlow())
+            || !inventory && serverOpenInventory
+            || !sneaking && mc.thePlayer.isSneaking
+            || !collide && mc.thePlayer.isCollidedHorizontally
+            || !blindness && mc.thePlayer.isPotionActive(Potion.blindness) && !mc.thePlayer.isSprinting
+            || !hunger && mc.thePlayer.foodStats.foodLevel <= 6f && !mc.thePlayer.capabilities.allowFlying
         ) return true
 
         if (!isMoving)