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

Fix access wires emagging machines (#14471)

Browse Source 
* Fix access wires emagging machines

* comment

* le fix
This commit is contained in:
Nemanja
2023-03-13 22:55:18 -04:00
committed by GitHub
parent 73efa95662
commit 89d3875cde
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Access/Components/AccessReaderComponent.cs
View File

@@ -13,6 +13,13 @@ namespace Content.Shared.Access.Components;
[RegisterComponent, NetworkedComponent]
public sealed class AccessReaderComponent : Component
{
/// <summary>
/// Whether or not the accessreader is enabled.
/// If not, it will always let people through.
/// </summary>
[DataField("enabled")]
public bool Enabled = true;
/// <summary>
/// The set of tags that will automatically deny an allowed check, if any of them are present.
/// </summary>
@@ -36,14 +43,17 @@ public sealed class AccessReaderComponent : Component
[Serializable, NetSerializable]
public sealed class AccessReaderComponentState : ComponentState
{
public bool Enabled;
public HashSet<string> DenyTags;
public List<HashSet<string>> AccessLists;
public HashSet<StationRecordKey> AccessKeys;
public AccessReaderComponentState(HashSet<string> denyTags, List<HashSet<string>> accessLists, HashSet<StationRecordKey> accessKeys)
public AccessReaderComponentState(bool enabled, HashSet<string> denyTags, List<HashSet<string>> accessLists, HashSet<StationRecordKey> accessKeys)
{
Enabled = enabled;
DenyTags = denyTags;
AccessLists = accessLists;
AccessKeys = accessKeys;

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

@@ -32,7 +32,7 @@ namespace Content.Shared.Access.Systems
private void OnGetState(EntityUid uid, AccessReaderComponent component, ref ComponentGetState args)
{
args.State = new AccessReaderComponentState(component.DenyTags, component.AccessLists,
args.State = new AccessReaderComponentState(component.Enabled, component.DenyTags, component.AccessLists,
component.AccessKeys);
}
@@ -40,6 +40,7 @@ namespace Content.Shared.Access.Systems
{
if (args.Current is not AccessReaderComponentState state)
return;
component.Enabled = state.Enabled;
component.AccessKeys = new (state.AccessKeys);
component.AccessLists = new (state.AccessLists);
component.DenyTags = new (state.DenyTags);
@@ -67,8 +68,9 @@ namespace Content.Shared.Access.Systems
private void OnEmagged(EntityUid uid, AccessReaderComponent reader, ref GotEmaggedEvent args)
{
// no fancy conditions
args.Handled = true;
reader.Enabled = false;
Dirty(reader);
}
/// <summary>
@@ -95,6 +97,10 @@ namespace Content.Shared.Access.Systems
{
var allEnts = FindPotentialAccessItems(entity);
// Access reader is totally disabled, so access is always allowed.
if (!reader.Enabled)
return true;
if (AreAccessTagsAllowed(FindAccessTags(entity, allEnts), reader))
return true;
@@ -111,12 +117,6 @@ namespace Content.Shared.Access.Systems
/// <param name="reader">An access reader to check against</param>
public bool AreAccessTagsAllowed(ICollection<string> accessTags, AccessReaderComponent reader)
{
if (HasComp<EmaggedComponent>(reader.Owner))
{
// Access reader is totally disabled, so access is always allowed.
return true;
}
if (reader.DenyTags.Overlaps(accessTags))
{
// Sec owned by cargo.