From 2748c64db23fe0faa54bd05b819066cd3272130f Mon Sep 17 00:00:00 2001
From: CallOfCreator <177672587+CallOfCreator@users.noreply.github.com>
Date: Wed, 14 Oct 2026 16:51:37 +0000
Subject: [PATCH] Fix custom controller bindings blocking unused vanilla
 actions

---
 MiraAPI/Keybinds/KeybindUtils.cs       | 3 +--
 MiraAPI/Keybinds/MiraGlobalKeybinds.cs | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MiraAPI/Keybinds/KeybindUtils.cs b/MiraAPI/Keybinds/KeybindUtils.cs
index 5131839..26bcf55 100644
--- a/MiraAPI/Keybinds/KeybindUtils.cs
+++ b/MiraAPI/Keybinds/KeybindUtils.cs
@@ -89,8 +89,7 @@ public static class KeybindUtils
 
     internal static bool IsControllerActionActive(int actionId)
     {
-        var buttons = CustomButtonManager.Buttons.Where(x => x.Keybind?.RewiredInputAction?.id == actionId).ToArray();
-        return buttons.Length == 0 || buttons.Any(x => x.Button != null && x.Button.isActiveAndEnabled && x.Enabled(PlayerControl.LocalPlayer?.Data?.Role));
+        return CustomButtonManager.Buttons.Any(x => x.Keybind?.RewiredInputAction?.id == actionId && x.Button != null && x.Button.isActiveAndEnabled && x.Enabled(PlayerControl.LocalPlayer?.Data?.Role));
     }
 
     /// <summary>
diff --git a/MiraAPI/Keybinds/MiraGlobalKeybinds.cs b/MiraAPI/Keybinds/MiraGlobalKeybinds.cs
index 57381ea..5ef5380 100644
--- a/MiraAPI/Keybinds/MiraGlobalKeybinds.cs
+++ b/MiraAPI/Keybinds/MiraGlobalKeybinds.cs
@@ -5,6 +5,7 @@ namespace MiraAPI.Keybinds;
 /// <summary>
 /// Class containing all default <see cref="MiraKeybind"/>s.
 /// Recommended for cross-mod compatibility.
+/// Controller bindings are unassigned by default.
 /// </summary>
 [RegisterCustomKeybinds]
 public static class MiraGlobalKeybinds
@@ -12,12 +13,12 @@ public static class MiraGlobalKeybinds
     /// <summary>
     /// Gets the keybind for primary abilities.
     /// </summary>
-    public static MiraKeybind PrimaryAbility { get; } = new("Primary Ability", KeyboardKeyCode.T, ControllerButton.RightTrigger);
+    public static MiraKeybind PrimaryAbility { get; } = new("Primary Ability", KeyboardKeyCode.T);
 
     /// <summary>
     /// Gets the keybind for secondary abilities.
     /// </summary>
-    public static MiraKeybind SecondaryAbility { get; } = new("Secondary Ability", KeyboardKeyCode.Y, ControllerButton.RightBumper);
+    public static MiraKeybind SecondaryAbility { get; } = new("Secondary Ability", KeyboardKeyCode.Y);
 
     /// <summary>
     /// Gets the keybind for Tertiary abilities.
@@ -27,7 +28,7 @@ public static class MiraGlobalKeybinds
     /// <summary>
     /// Gets the keybind for primary modifier abilities.
     /// </summary>
-    public static MiraKeybind ModifierPrimaryAbility { get; } = new("Modifier Primary Ability", KeyboardKeyCode.I, ControllerButton.LeftTrigger);
+    public static MiraKeybind ModifierPrimaryAbility { get; } = new("Modifier Primary Ability", KeyboardKeyCode.I);
 
     /// <summary>
     /// Gets the keybind for secondary modifier abilities.