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

Revert "Fix some friend access violations by allowing others access. (#8594) (#8703)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-06-07 13:44:31 +02:00
committed by GitHub
parent c5f7c61041
commit cecf87997b
162 changed files with 169 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Access/Components/AccessComponent.cs
View File

@@ -7,11 +7,10 @@ namespace Content.Shared.Access.Components
/// Simple mutable access provider found on ID cards and such.
/// </summary>
[RegisterComponent]
[Access(typeof(AccessSystem))]
[Friend(typeof(AccessSystem))]
public sealed class AccessComponent : Component
{
[DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
[Access(typeof(AccessSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public HashSet<string> Tags = new();
[DataField("groups", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessGroupPrototype>))]

4
Content.Shared/Access/Components/IdCardComponent.cs
View File

@@ -6,15 +6,13 @@ namespace Content.Shared.Access.Components
// TODO BUI NETWORKING if ever clients can open their own BUI's (id card console, pda), then this data should be
// networked.
[RegisterComponent]
[Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem))]
[Friend(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem))]
public sealed class IdCardComponent : Component
{
[DataField("originalOwnerName")]
public string OriginalOwnerName = default!;
[DataField("fullName")]
[Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem),
Other = AccessPermissions.ReadWrite)] // FIXME Friends
public string? FullName;
[DataField("jobTitle")]