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

Clean up PDA code a little.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-07-22 02:22:05 +02:00
parent 1386b8ca2d
commit 551973fbb9
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/GameObjects/Components/PDA/PDAComponent.cs
View File

@@ -39,7 +39,7 @@ namespace Content.Server.GameObjects.Components.PDA
[ViewVariables] private BoundUserInterface _interface = default!; [ViewVariables] private BoundUserInterface _interface = default!;
[ViewVariables] private string _startingIdCard = default!; [ViewVariables] private string _startingIdCard = default!;
[ViewVariables] public bool IdSlotEmpty => _idSlot.ContainedEntities.Count < 1; [ViewVariables] public bool IdSlotEmpty => _idSlot.ContainedEntities.Count < 1;
[ViewVariables] public IEntity? OwnerMob { get; private set; } [ViewVariables] public string? OwnerName { get; private set; }
[ViewVariables] public IdCardComponent? ContainedID { get; private set; } [ViewVariables] public IdCardComponent? ContainedID { get; private set; }
@@ -115,7 +115,7 @@ namespace Content.Server.GameObjects.Components.PDA
{ {
var ownerInfo = new PDAIdInfoText var ownerInfo = new PDAIdInfoText
{ {
ActualOwnerName = OwnerMob?.Name, ActualOwnerName = OwnerName,
IdOwner = ContainedID?.FullName, IdOwner = ContainedID?.FullName,
JobTitle = ContainedID?.JobTitle JobTitle = ContainedID?.JobTitle
}; };
@@ -182,16 +182,10 @@ namespace Content.Server.GameObjects.Components.PDA
return true; return true;
} }
public void SetPDAOwner(IEntity mob) public void SetPDAOwner(string name)
{ {
if (mob == OwnerMob) OwnerName = name;
{
return;
}
OwnerMob = mob;
UpdatePDAUserInterface(); UpdatePDAUserInterface();
} }
private void InsertIdCard(IdCardComponent card) private void InsertIdCard(IdCardComponent card)

2
Content.Server/GameTicking/GameTicker.cs
View File

@@ -800,7 +800,7 @@ namespace Content.Server.GameTicking
var access = card.Owner.GetComponent<AccessComponent>(); var access = card.Owner.GetComponent<AccessComponent>();
var accessTags = access.Tags; var accessTags = access.Tags;
accessTags.UnionWith(jobPrototype.Access); accessTags.UnionWith(jobPrototype.Access);
pdaComponent.SetPDAOwner(mob); pdaComponent.SetPDAOwner(characterName);
var mindComponent = mob.GetComponent<MindComponent>(); var mindComponent = mob.GetComponent<MindComponent>();
if (mindComponent.HasMind) //Redundancy checks. if (mindComponent.HasMind) //Redundancy checks.
{ {