From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 17 Feb 2025 00:29:30 +0000 (-0500)
Subject: Fix debug assert in ScoopableSolution (#35225)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=04c88e86b322308eb7cd9d04828a0ad753c93ea4;p=space-station-14.git

Fix debug assert in ScoopableSolution (#35225)

* Fix debug assert in ScoopableSolution

* Don't stomp the old Handled value
---

diff --git a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
index 84f1e45616..86f9ffa390 100644
--- a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
@@ -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)