tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Winkarst-cpu
2025-08-13 09:35:35 +03:00
committed by GitHub
parent 024301e698
commit cea8dea005
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
View File

@@ -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;