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

fix DoAfter DistanceThreshold (#39276)

Browse Source
This commit is contained in:
slarticodefast
2025-08-06 16:35:31 +02:00
committed by GitHub
parent ca18576625
commit c4016b97c5
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/DoAfter/DoAfterArgs.cs
View File

@@ -122,7 +122,7 @@ public sealed partial class DoAfterArgs
/// Threshold for distance user from the used OR target entities. /// Threshold for distance user from the used OR target entities.
/// </summary> /// </summary>
[DataField] [DataField]
public float? DistanceThreshold; public float? DistanceThreshold = 1.5f;
/// <summary> /// <summary>
/// Whether damage will cancel the DoAfter. See also <see cref="DamageThreshold"/>. /// Whether damage will cancel the DoAfter. See also <see cref="DamageThreshold"/>.

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

@@ -192,11 +192,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value, args.DistanceThreshold.Value)) if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value, args.DistanceThreshold.Value))
return true; return true;
} }
else
{
if (!_interaction.InRangeUnobstructed(args.User, args.Target.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.
@@ -209,11 +204,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
args.DistanceThreshold.Value)) args.DistanceThreshold.Value))
return true; return true;
} }
else
{
if (!_interaction.InRangeUnobstructed(args.User,args.Used.Value))
return true;
}
} }
if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter)) if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))