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

AccessReader IsAllowed use resolve (#8527)

Browse Source
This commit is contained in:
keronshb
2022-06-01 11:26:50 -04:00
committed by GitHub
parent 7f984792a1
commit d5620aa833
11 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Access/Systems/AccessReaderSystem.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Shared.Access.Systems
private void OnLinkAttempt(EntityUid uid, AccessReaderComponent component, LinkAttemptEvent args)
{
if (component.Enabled && !IsAllowed(component, args.User))
if (component.Enabled && !IsAllowed(args.User, component))
args.Cancel();
}
@@ -59,13 +59,17 @@ namespace Content.Shared.Access.Systems
/// If no access is found, an empty set is used instead.
/// </remarks>
/// <param name="entity">The entity to bor access.</param>
public bool IsAllowed(AccessReaderComponent reader, EntityUid entity)
/// <param name="reader"></param>
public bool IsAllowed(EntityUid entity, AccessReaderComponent? reader = null)
{
if (!Resolve(entity, ref reader, false))
return true;
var tags = FindAccessTags(entity);
return IsAllowed(reader, tags);
return IsAllowed(tags, reader);
}
public bool IsAllowed(AccessReaderComponent reader, ICollection<string> accessTags)
public bool IsAllowed(ICollection<string> accessTags, AccessReaderComponent reader)
{
if (!reader.Enabled)
{