Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix starting gear without PDAs (#24463)

Browse Source 
* fix starting gear without PDAs

* legacy as shit
This commit is contained in:
Nemanja
2024-01-23 19:02:24 -05:00
committed by GitHub
parent a86659d731
commit 71cb62e9c6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Station/Systems/StationSpawningSystem.cs
View File

@@ -182,10 +182,13 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
if (!InventorySystem.TryGetSlotEntity(entity, "id", out var idUid)) if (!InventorySystem.TryGetSlotEntity(entity, "id", out var idUid))
return; return;
if (!EntityManager.TryGetComponent(idUid, out PdaComponent? pdaComponent) || !TryComp<IdCardComponent>(pdaComponent.ContainedId, out var card)) var cardId = idUid.Value;
if (TryComp<PdaComponent>(idUid, out var pdaComponent) && pdaComponent.ContainedId != null)
cardId = pdaComponent.ContainedId.Value;
if (!TryComp<IdCardComponent>(cardId, out var card))
return; return;
var cardId = pdaComponent.ContainedId.Value;
_cardSystem.TryChangeFullName(cardId, characterName, card); _cardSystem.TryChangeFullName(cardId, characterName, card);
_cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card); _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
@@ -203,7 +206,8 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
_accessSystem.SetAccessToJob(cardId, jobPrototype, extendedAccess); _accessSystem.SetAccessToJob(cardId, jobPrototype, extendedAccess);
_pdaSystem.SetOwner(idUid.Value, pdaComponent, characterName); if (pdaComponent != null)
_pdaSystem.SetOwner(idUid.Value, pdaComponent, characterName);
} }