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

fix: fix non-access checking EntityTargetActions (#38731)

Browse Source
This commit is contained in:
Perry Fraser
2025-07-22 15:34:39 -04:00
committed by GitHub
parent f16175a6e3
commit 1ee7dffe6d
5 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Actions/ActionsSystem.cs
View File

@@ -334,7 +334,12 @@ namespace Content.Client.Actions
private void OnEntityTargetAttempt(Entity<EntityTargetActionComponent> ent, ref ActionTargetAttemptEvent args)
{
if (args.Handled || args.Input.EntityUid is not { Valid: true } entity)
if (args.Handled)
return;
args.Handled = true;
if (args.Input.EntityUid is not { Valid: true } entity)
return;
// let world target component handle it
@@ -345,8 +350,6 @@ namespace Content.Client.Actions
return;
}
args.Handled = true;
var action = args.Action;
var user = args.User;