Adjust interaction ordering & interaction conditions (#6387)

Content.Server/Fluids/Components/MopComponent.cs

@@ -103,14 +103,13 @@ namespace Content.Server.Fluids.Components
             var solutionSystem = EntitySystem.Get<SolutionContainerSystem>();
             var spillableSystem = EntitySystem.Get<SpillableSystem>();
 
-            if (!solutionSystem.TryGetSolution(Owner, SolutionName, out var contents ) ||
-                Mopping ||
-                !eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
+            if (!eventArgs.CanReach ||
+                !solutionSystem.TryGetSolution(Owner, SolutionName, out var contents ) ||
+                Mopping)
             {
                 return false;
             }
 
-
             if (eventArgs.Target is not {Valid: true} target)
             {
                 // Drop the liquid on the mop on to the ground