Reduce action blocker uses and add target entity to CanInteract (#6655)
This commit is contained in:
@@ -79,21 +79,8 @@ namespace Content.Server.Labels
|
||||
args.Handled = true;
|
||||
}
|
||||
|
||||
private bool CheckInteract(ICommonSession session)
|
||||
{
|
||||
if (session.AttachedEntity is not {Valid: true } uid
|
||||
|| !Get<ActionBlockerSystem>().CanInteract(uid)
|
||||
|| !Get<ActionBlockerSystem>().CanUse(uid))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private void OnHandLabelerLabelChanged(EntityUid uid, HandLabelerComponent handLabeler, HandLabelerLabelChangedMessage args)
|
||||
{
|
||||
if (!CheckInteract(args.Session))
|
||||
return;
|
||||
|
||||
handLabeler.AssignedLabel = args.Label.Trim().Substring(0, Math.Min(handLabeler.MaxLabelChars, args.Label.Length));
|
||||
DirtyUI(uid, handLabeler);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user