From: Tayrtahn Date: Mon, 5 May 2025 22:35:15 +0000 (-0400) Subject: Fix `ComponentTogglerSystem` deletion error (#37198) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=532ef05140de61425fd74b6e85d1d8b4c7121e11;p=space-station-14.git Fix `ComponentTogglerSystem` deletion error (#37198) Don't try to toggle if target is terminating or deleted --- 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);