]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix `ComponentTogglerSystem` deletion error (#37198)
authorTayrtahn <tayrtahn@gmail.com>
Mon, 5 May 2025 22:35:15 +0000 (18:35 -0400)
committerGitHub <noreply@github.com>
Mon, 5 May 2025 22:35:15 +0000 (18:35 -0400)
Don't try to toggle if target is terminating or deleted

Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs

index 760cefe27d4117203f97f7f5b5a371ec5f16e67f..59a04201a3863a3a57d581cf364de78517e6bc40 100644 (file)
@@ -17,6 +17,8 @@ public sealed class ComponentTogglerSystem : EntitySystem
     private void OnToggled(Entity<ComponentTogglerComponent> 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);