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

Fix errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 21:02:04 +01:00
parent 2a3b7d809d
commit ab9d0cc6d8
94 changed files with 568 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,10 +34,10 @@ namespace Content.Server.Labels
private void AfterInteractOn(EntityUid uid, HandLabelerComponent handLabeler, AfterInteractEvent args)
{
if (args.Target == null || !handLabeler.Whitelist.IsValid(args.Target))
if (args.Target is not {Valid: true} target || !handLabeler.Whitelist.IsValid(target))
return;
AddLabelTo(uid, handLabeler, args.Target, out string? result);
AddLabelTo(uid, handLabeler, target, out string? result);
if (result != null)
handLabeler.Owner.PopupMessage(args.User, result);
}

4
Content.Server/Labels/Label/LabelSystem.cs
View File

@@ -62,7 +62,7 @@ namespace Content.Server.Labels
private void OnExamined(EntityUid uid, PaperLabelComponent comp, ExaminedEvent args)
{
if (comp.LabelSlot.Item == null)
if (comp.LabelSlot.Item is not {Valid: true} item)
return;
if (!args.IsInDetailsRange)
@@ -71,7 +71,7 @@ namespace Content.Server.Labels
return;
}
if (!EntityManager.TryGetComponent(comp.LabelSlot.Item, out PaperComponent paper))
if (!EntityManager.TryGetComponent(item, out PaperComponent paper))
// Assuming yaml has the correct entity whitelist, this should not happen.
return;