NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix Organs causing PVS Reload. (#45958)

Browse source 
Race condition :P
This commit is contained in:
Princess Cheeseballs 2026-09-10 10:09:55 +00:00 • committed by GitHub
parent a6c445779b
commit db07b48eb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Content.Shared/Body/OrganRelationSystem.cs
View file

@ -18,10 +18,10 @@ public sealed partial class OrganRelationSystem : EntitySystem
private void OnChildShutdown(Entity<ChildOrganComponent> ent, ref ComponentShutdown args)
{
if (ent.Comp.Parent is not { } parentUid)
// Parent shut down before the child.
if (ent.Comp.Parent is not { } parentUid || !_parent.TryComp(parentUid, out var parentComp))
return;
var parentComp = _parent.Comp(parentUid);
parentComp.Children.Remove(ent);
Dirty(parentUid, parentComp);
}
@ -33,9 +33,11 @@ public sealed partial class OrganRelationSystem : EntitySystem
foreach (var childUid in ent.Comp.Children)
{
var childComp = _child.Comp(childUid);
childComp.Parent = null;
// Child shut down before the parent.
if (!_child.TryComp(childUid, out var childComp))
continue;
childComp.Parent = null;
Dirty(childUid, childComp);
}
}