Merge stable into master (#38395)

2025-06-17 17:25:30 +02:00
parent 4638833ae3 d25046461e
commit 5a69b7e2fb
1 changed files with 1 additions and 1 deletions
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -108,7 +108,7 @@ public abstract class SharedActionsSystem : EntitySystem
    /// </summary>
    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;

        if (!_actionQuery.Resolve(ent, ref ent.Comp, logError))