From 532ef05140de61425fd74b6e85d1d8b4c7121e11 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Mon, 5 May 2025 18:35:15 -0400 Subject: [PATCH] Fix `ComponentTogglerSystem` deletion error (#37198) Don't try to toggle if target is terminating or deleted --- Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs b/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs index 760cefe27d..59a04201a3 100644 --- a/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs +++ b/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs @@ -17,6 +17,8 @@ public sealed class ComponentTogglerSystem : EntitySystem private void OnToggled(Entity ent, ref ItemToggledEvent args) { var target = ent.Comp.Parent ? Transform(ent).ParentUid : ent.Owner; + if (TerminatingOrDeleted(target)) + return; if (args.Activated) EntityManager.AddComponents(target, ent.Comp.Components); -- 2.51.2