fixes

CCBlueX · Jan 8, 2025 · 59754fd · 59754fd
1 parent a8fff35
commit 59754fd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/...n/java/net/ccbluex/liquidbounce/injection/mixins/minecraft/client/MixinKeyboardInput.java b/...n/java/net/ccbluex/liquidbounce/injection/mixins/minecraft/client/MixinKeyboardInput.java
@@ -76,7 +76,7 @@ private PlayerInput modifyInput(PlayerInput original) {
         EventManager.INSTANCE.callEvent(event);
         var directionalInput = changeDirection(event.getDirectionalInput());
 
-        var sprintEvent = new SprintEvent(original.sprint(), SprintEvent.Source.INPUT);
+        var sprintEvent = new SprintEvent(directionalInput, original.sprint(), SprintEvent.Source.INPUT);
         EventManager.INSTANCE.callEvent(sprintEvent);
 
         return new PlayerInput(

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/event/events/GameEvents.kt b/src/main/kotlin/net/ccbluex/liquidbounce/event/events/GameEvents.kt
@@ -61,11 +61,11 @@ class MovementInputEvent(
 ) : Event()
 
 @Nameable("sprint")
-class SprintEvent(var sprint: Boolean, val source: Source) : Event() {
-    enum class Source(val key: Boolean) {
-        INPUT(true),
-        MOVEMENT_TICK(true),
-        NETWORK(false)
+class SprintEvent(val directionalInput: DirectionalInput, var sprint: Boolean, val source: Source) : Event() {
+    enum class Source {
+        INPUT,
+        MOVEMENT_TICK,
+        NETWORK
     }
 }
 

diff --git a/...in/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleSuperKnockback.kt b/...in/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleSuperKnockback.kt
@@ -114,7 +114,8 @@ object ModuleSuperKnockback : ClientModule("SuperKnockback", Category.COMBAT, al
         private val movementHandler = handler<SprintEvent>(
             priority = EventPriorityConvention.FIRST_PRIORITY
         ) { event ->
-            if (cancelSprint && event.source.key) {
+            if (cancelSprint && (event.source == SprintEvent.Source.MOVEMENT_TICK ||
+                    event.source == SprintEvent.Source.INPUT)) {
                 event.sprint = false
             }
         }

diff --git a/...kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/killaura/ModuleKillAura.kt b/...kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/killaura/ModuleKillAura.kt
@@ -549,7 +549,8 @@ object ModuleKillAura : ClientModule("KillAura", Category.COMBAT) {
 
     @Suppress("unused")
     private val sprintHandler = handler<SprintEvent> { event ->
-        if (shouldBlockSprinting) {
+        if (shouldBlockSprinting && (event.source == SprintEvent.Source.MOVEMENT_TICK ||
+                event.source == SprintEvent.Source.INPUT)) {
             event.sprint = false
         }
     }

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/ModuleSprint.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/ModuleSprint.kt
@@ -82,6 +82,10 @@ object ModuleSprint : ClientModule("Sprint", Category.MOVEMENT) {
     private val sprintHandler = handler<SprintEvent>(
         priority = EventPriorityConvention.FIRST_PRIORITY
     ) { event ->
+        if (!event.directionalInput.isMoving) {
+            return@handler
+        }
+
         if (event.source == SprintEvent.Source.MOVEMENT_TICK || event.source == SprintEvent.Source.INPUT) {
             event.sprint = true
         }