Fix UI interaction priority (#27631)

space-wizards · May 2, 2024 · 3c3c2da · 3c3c2da
1 parent 8a7f709
commit 3c3c2da
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
@@ -27,6 +28,7 @@ public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<ActivatableUIComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<ActivatableUIComponent, ActivateInWorldEvent>(OnActivate);
         SubscribeLocalEvent<ActivatableUIComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<ActivatableUIComponent, HandDeselectedEvent>(OnHandDeselected);
@@ -99,6 +101,9 @@ private bool ShouldAddVerb<T>(EntityUid uid, ActivatableUIComponent component, G
         if (!args.CanAccess)
             return false;
 
+        if (!component.RequiredItems?.IsValid(args.Using ?? default, EntityManager) ?? false)
+            return false;
+
         if (component.RequireHands)
         {
             if (args.Hands == null)
@@ -117,6 +122,20 @@ private bool ShouldAddVerb<T>(EntityUid uid, ActivatableUIComponent component, G
         return args.CanInteract || component.AllowSpectator && HasComp<GhostComponent>(args.User);
     }
 
+    private void OnUseInHand(EntityUid uid, ActivatableUIComponent component, UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (component.VerbOnly)
+            return;
+
+        if (component.RequiredItems != null)
+            return;
+
+        args.Handled = InteractUI(args.User, uid, component);
+    }
+
     private void OnActivate(EntityUid uid, ActivatableUIComponent component, ActivateInWorldEvent args)
     {
         if (args.Handled)