fix: Fix multi modifier keymappings not ignoring conflicts

TwelveIterationMods · Sep 14, 2023 · 61f1fbe · 61f1fbe
1 parent ac48bd3
commit 61f1fbe
Showing 1 changed file with 1 addition 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
@@ -181,6 +181,7 @@ public Optional<Boolean> conflictsWith(KeyMapping first, KeyMapping second) {
     @Override
     public void ignoreConflicts(KeyMapping keyMapping) {
         ignoreConflicts.add(keyMapping);
+        ignoreConflicts.addAll(multiModifierKeyMappings.getOrDefault(keyMapping, Collections.emptySet()));
     }
 
     protected abstract boolean isContextActive(KeyMapping keyMapping);