From 61f1fbea82e03382e6e7fe5c90633298114668a1 Mon Sep 17 00:00:00 2001
From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com>
Date: Thu, 14 Sep 2023 16:39:15 +0200
Subject: [PATCH] fix: Fix multi modifier keymappings not ignoring conflicts

---
 .../balm/common/client/keymappings/CommonBalmKeyMappings.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared/src/main/java/net/blay09/mods/balm/common/client/keymappings/CommonBalmKeyMappings.java b/shared/src/main/java/net/blay09/mods/balm/common/client/keymappings/CommonBalmKeyMappings.java
index 91de4bf4..a2fbe9c4 100644
--- a/shared/src/main/java/net/blay09/mods/balm/common/client/keymappings/CommonBalmKeyMappings.java
+++ b/shared/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);