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

Add events for custom action target validation (#27230)

Browse Source
This commit is contained in:
DrSmugleaf
2024-04-22 01:39:50 -07:00
committed by GitHub
parent 210e6f6444
commit b0e6ff6779
5 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Actions/ActionOnInteractSystem.cs
View File

@@ -64,7 +64,7 @@ public sealed class ActionOnInteractSystem : EntitySystem
var entOptions = GetValidActions<EntityTargetActionComponent>(component.ActionEntities, args.CanReach);
for (var i = entOptions.Count - 1; i >= 0; i--)
{
var action = entOptions[i].Comp;
var action = entOptions[i];
if (!_actions.ValidateEntityTarget(args.User, args.Target.Value, action))
entOptions.RemoveAt(i);
}
@@ -88,7 +88,7 @@ public sealed class ActionOnInteractSystem : EntitySystem
var options = GetValidActions<WorldTargetActionComponent>(component.ActionEntities, args.CanReach);
for (var i = options.Count - 1; i >= 0; i--)
{
var action = options[i].Comp;
var action = options[i];
if (!_actions.ValidateWorldTarget(args.User, args.ClickLocation, action))
options.RemoveAt(i);
}