tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix docking adding comps to terminating entities (#11010)

Browse Source
This commit is contained in:
Leon Friedrich
2022-09-04 19:26:20 +12:00
committed by GitHub
parent 0eedb5088c
commit ff61bc12a4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Shuttles/Systems/DockingSystem.cs
View File

@@ -461,13 +461,13 @@ namespace Content.Server.Shuttles.Systems
_doorSystem.TryClose(doorB.Owner, doorB); _doorSystem.TryClose(doorB.Owner, doorB);
} }
if (!Deleted(dock.Owner)) if (LifeStage(dock.Owner) < EntityLifeStage.Terminating)
{ {
var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dock.Owner); var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dock.Owner);
recentlyDocked.LastDocked = dock.DockedWith.Value; recentlyDocked.LastDocked = dock.DockedWith.Value;
} }
if (!Deleted(dock.DockedWith.Value)) if (TryComp(dock.DockedWith.Value, out MetaDataComponent? meta) && meta.EntityLifeStage < EntityLifeStage.Terminating)
{ {
var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dock.DockedWith.Value); var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dock.DockedWith.Value);
recentlyDocked.LastDocked = dock.DockedWith.Value; recentlyDocked.LastDocked = dock.DockedWith.Value;