Fix: Break do_after if target/tool becomes inaccessible (#35079)

diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
index 31ff0348091ff2d4d7e519f3a452f1a452a85a1a..97ff74f64acc2d978d8f34a4e65f0221ca77fae4 100644 (file)
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
@@ -184,22 +184,22 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
             }
         }
 
-        // Whether the user and the target are too far apart.
+        // Whether the user and the target are too far apart or they are inaccessible.
         if (args.Target != null)
         {
             if (args.DistanceThreshold != null)
             {
-                if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value, args.DistanceThreshold.Value))
+                if (!_interaction.InRangeAndAccessible(args.User, args.Target.Value, args.DistanceThreshold.Value))
                     return true;
             }
         }
 
-        // Whether the distance between the tool and the user has grown too much.
+        // Whether the distance between the tool and the user has grown too much or they became inaccessible.
         if (args.Used != null)
         {
             if (args.DistanceThreshold != null)
             {
-                if (!_interaction.InRangeUnobstructed(args.User,
+                if (!_interaction.InRangeAndAccessible(args.User,
                         args.Used.Value,
                         args.DistanceThreshold.Value))
                     return true;