From 0a991593f5d9e17691005b845c163c8bcc983033 Mon Sep 17 00:00:00 2001 From: Myra Date: Wed, 13 Aug 2025 22:07:46 +0200 Subject: [PATCH] Revert "Fix: Break do_after if target/tool becomes inaccessible" (#39617) --- Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs index 97ff74f64a..31ff034809 100644 --- 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 or they are inaccessible. + // Whether the user and the target are too far apart. if (args.Target != null) { if (args.DistanceThreshold != null) { - if (!_interaction.InRangeAndAccessible(args.User, args.Target.Value, args.DistanceThreshold.Value)) + if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value, args.DistanceThreshold.Value)) return true; } } - // Whether the distance between the tool and the user has grown too much or they became inaccessible. + // Whether the distance between the tool and the user has grown too much. if (args.Used != null) { if (args.DistanceThreshold != null) { - if (!_interaction.InRangeAndAccessible(args.User, + if (!_interaction.InRangeUnobstructed(args.User, args.Used.Value, args.DistanceThreshold.Value)) return true; -- 2.51.2