fix: Automatically set modifier keybinds to ignore conflicts

TwelveIterationMods · Sep 18, 2023 · 8de629e · 8de629e
1 parent 408e0e1
commit 8de629e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...d/src/main/java/net/blay09/mods/balm/common/client/keymappings/CommonBalmKeyMappings.java b/...d/src/main/java/net/blay09/mods/balm/common/client/keymappings/CommonBalmKeyMappings.java
@@ -50,6 +50,7 @@ protected void registerModifierKeyMappings(KeyMapping baseMapping, KeyConflictCo
                     toKeyCode(keyModifiers.get(i)),
                     baseMapping.getCategory());
             multiModifierKeyMappings.computeIfAbsent(baseMapping, it -> new HashSet<>()).add(subKeyMapping);
+            ignoreConflicts.add(subKeyMapping);
         }
     }
 
@@ -63,6 +64,7 @@ protected void registerCustomModifierKeyMappings(KeyMapping baseMapping, KeyConf
                     keyModifiers.get(i).getValue(),
                     baseMapping.getCategory());
             multiModifierKeyMappings.computeIfAbsent(baseMapping, it -> new HashSet<>()).add(subKeyMapping);
+            ignoreConflicts.add(subKeyMapping);
         }
     }