]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix BuckleSystem always marking InteractHandEvent as Handled (#33602)
authorMilenVolf <63782763+MilenVolf@users.noreply.github.com>
Sun, 1 Dec 2024 22:09:34 +0000 (01:09 +0300)
committerGitHub <noreply@github.com>
Sun, 1 Dec 2024 22:09:34 +0000 (23:09 +0100)
* Add check before marking event as handled

* Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

index 1a15e52a3c43119291e390d7d85a8d9208a6d273..4a4da176f6d5e54b8f1b7dbc88324bc718a16a48 100644 (file)
@@ -115,10 +115,9 @@ public abstract partial class SharedBuckleSystem
             return;
 
         if (ent.Comp.BuckledTo != null)
-            TryUnbuckle(ent!, args.User, popup: true);
+            args.Handled = TryUnbuckle(ent!, args.User, popup: true);
 
         // TODO BUCKLE add out bool for whether a pop-up was generated or not.
-        args.Handled = true;
     }
 
     private void AddStrapVerbs(EntityUid uid, StrapComponent component, GetVerbsEvent<InteractionVerb> args)