]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix debug assert in ScoopableSolution (#35225)
authorTayrtahn <tayrtahn@gmail.com>
Mon, 17 Feb 2025 00:29:30 +0000 (19:29 -0500)
committerGitHub <noreply@github.com>
Mon, 17 Feb 2025 00:29:30 +0000 (01:29 +0100)
* Fix debug assert in ScoopableSolution

* Don't stomp the old Handled value

Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs

index 84f1e4561607d64dccdb7d8e317b64ce89c24779..86f9ffa3909e51d44afa6b3a27c16edc5ead258f 100644 (file)
@@ -24,7 +24,10 @@ public sealed class ScoopableSolutionSystem : EntitySystem
 
     private void OnInteractUsing(Entity<ScoopableSolutionComponent> ent, ref InteractUsingEvent args)
     {
-        TryScoop(ent, args.Used, args.User);
+        if (args.Handled)
+            return;
+
+        args.Handled = TryScoop(ent, args.Used, args.User);
     }
 
     public bool TryScoop(Entity<ScoopableSolutionComponent> ent, EntityUid beaker, EntityUid user)