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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Labels/Label/HandLabelerSystem.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Labels
private void AfterInteractOn(EntityUid uid, HandLabelerComponent handLabeler, AfterInteractEvent args)
{
if (args.Target == null || !handLabeler.Whitelist.IsValid(args.Target.Uid))
if (args.Target == null || !handLabeler.Whitelist.IsValid(args.Target))
return;
AddLabelTo(uid, handLabeler, args.Target, out string? result);
@@ -53,7 +53,7 @@ namespace Content.Server.Labels
LabelComponent label = target.EnsureComponent<LabelComponent>();
if (label.OriginalName != null)
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target.Uid).EntityName = label.OriginalName;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName = label.OriginalName;
label.OriginalName = null;
if (handLabeler.AssignedLabel == string.Empty)
@@ -63,16 +63,16 @@ namespace Content.Server.Labels
return;
}
label.OriginalName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target.Uid).EntityName;
string val = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target.Uid).EntityName + $" ({handLabeler.AssignedLabel})";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target.Uid).EntityName = val;
label.OriginalName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName;
string val = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName + $" ({handLabeler.AssignedLabel})";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName = val;
label.CurrentLabel = handLabeler.AssignedLabel;
result = Loc.GetString("hand-labeler-successfully-applied");
}
private void OnUseInHand(EntityUid uid, HandLabelerComponent handLabeler, UseInHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User.Uid, out ActorComponent? actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
return;
handLabeler.Owner.GetUIOrNull(HandLabelerUiKey.Key)?.Open(actor.PlayerSession);