Skip to content

Fix binds without modifiers not matching while sprinting or crouching #6671

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.

Sign up for GitHub

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

Open
sandwichmm wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

Fix binds without modifiers not matching while sprinting or crouching #6671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/main/java/meteordevelopment/meteorclient/systems/modules/Modules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,17 @@ private void onMouseClick(MouseClickEvent event) {
private void onAction(boolean isKey, int value, int modifiers, boolean isPress) {
if (mc.gui.screen() != null || Input.isKeyPressed(InputConstants.KEY_F3)) return;

boolean moddedBindMatched = false;
for (Module module : moduleInstances.values()) {
if (module.keybind.hasMods() && module.keybind.matches(isKey, value, modifiers)) {
moddedBindMatched = true;
break;
}
}

for (Module module : moduleInstances.values()) {
if (!module.keybind.hasMods() && moddedBindMatched) continue;

if (module.keybind.matches(isKey, value, modifiers) && (isPress || (module.toggleOnBindRelease && module.isActive()))) {
module.toggle();
module.sendToggledMsg();
Expand Down Expand Up @@ -581,4 +591,4 @@ private void initMisc() {
add(new Spam());
add(new Swarm());
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/utils/misc/Keybind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public boolean canBindTo(boolean isKey, int value, int modifiers) {

public boolean matches(InputConstants.Key key, Set<Modifier> modifiers) {
if (!isSet() || !this.key.equals(key)) return false;
if (!hasMods()) return modifiers.stream().noneMatch(m -> m == Modifier.SHIFT || m == Modifier.CONTROL || m == Modifier.ALT || m == Modifier.SUPER);
if (!hasMods()) return true;
return this.modifiers.equals(modifiers);
}

Expand Down Expand Up @@ -275,4 +275,4 @@ private static InputConstants.Key mouse(int button) {
return InputConstants.Type.MOUSE.getOrCreate(button);
}

}
}