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

Fix various errors/exceptions (#22841)

Browse Source 
* Fix entity storage localization

* Fix HumanoidAppearanceComponent resolve

* Fix null reference exceptions

* Fix duplicate key error

* Fix artifact error spam

* actually maybe this is what its meant to do

* Fix entities playing sounds on deletion
This commit is contained in:
Leon Friedrich
2023-12-22 02:26:08 -05:00
committed by GitHub
parent af753c13a5
commit 907b873145
9 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,45 +459,24 @@ namespace Content.Server.Shuttles.Systems
if (dock.DockedWith == null)
return;
if (TryComp<DoorBoltComponent>(dockUid, out var airlockA))
{
_bolts.SetBoltsWithAudio(dockUid, airlockA, false);
}
if (TryComp<DoorBoltComponent>(dock.DockedWith, out var airlockB))
{
_bolts.SetBoltsWithAudio(dock.DockedWith.Value, airlockB, false);
}
if (TryComp(dockUid, out DoorComponent? doorA))
{
if (_doorSystem.TryClose(dockUid, doorA))
{
doorA.ChangeAirtight = true;
}
}
if (TryComp(dock.DockedWith, out DoorComponent? doorB))
{
if (_doorSystem.TryClose(dock.DockedWith.Value, doorB))
{
doorB.ChangeAirtight = true;
}
}
if (LifeStage(dockUid) < EntityLifeStage.Terminating)
{
var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dockUid);
recentlyDocked.LastDocked = dock.DockedWith.Value;
}
if (TryComp(dock.DockedWith.Value, out MetaDataComponent? meta) && meta.EntityLifeStage < EntityLifeStage.Terminating)
{
var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dock.DockedWith.Value);
recentlyDocked.LastDocked = dock.DockedWith.Value;
}
OnUndock(dockUid, dock.DockedWith.Value);
OnUndock(dock.DockedWith.Value, dockUid);
Cleanup(dockUid, dock);
}
private void OnUndock(EntityUid dockUid, EntityUid other)
{
if (TerminatingOrDeleted(dockUid))
return;
if (TryComp<DoorBoltComponent>(dockUid, out var airlock))
_bolts.SetBoltsWithAudio(dockUid, airlock, false);
if (TryComp(dockUid, out DoorComponent? door) && _doorSystem.TryClose(dockUid, door))
door.ChangeAirtight = true;
var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dockUid);
recentlyDocked.LastDocked = other;
}
}
}