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

Merge stable into master (#38395)

Browse Source
This commit is contained in:
slarticodefast
2025-06-17 17:25:30 +02:00
committed by GitHub
parent 4638833ae3 d25046461e
commit 5a69b7e2fb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Actions/SharedActionsSystem.cs
View File

@@ -108,7 +108,7 @@ public abstract class SharedActionsSystem : EntitySystem
/// </summary> /// </summary>
public Entity<ActionComponent>? GetAction(Entity<ActionComponent?>? action, bool logError = true) public Entity<ActionComponent>? GetAction(Entity<ActionComponent?>? action, bool logError = true)
{ {
if (action is not {} ent || TerminatingOrDeleted(ent)) if (action is not {} ent || Deleted(ent))
return null; return null;
if (!_actionQuery.Resolve(ent, ref ent.Comp, logError)) if (!_actionQuery.Resolve(ent, ref ent.Comp, logError))