Action bugfixes (#21321)

2023-10-29 19:10:30 +11:00
parent f2bc0ff128
commit 6e49331e4d
2 changed files with 17 additions and 1 deletions
--- a/Content.Shared/Actions/ActionContainerSystem.cs
+++ b/Content.Shared/Actions/ActionContainerSystem.cs
@@ -213,6 +213,9 @@ public sealed class ActionContainerSystem : EntitySystem

    private void OnShutdown(EntityUid uid, ActionsContainerComponent component, ComponentShutdown args)
    {
+        if (_timing.ApplyingState && component.NetSyncEnabled)
+            return; // The game state should handle the container removal & action deletion.
+
        component.Container.Shutdown();
    }