tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Access & AccessReader to shared. (#5798)

Browse Source 
* git mv

* Move Access Component & system.

- Name space changes
- Rename AccessReader to AccessReaderComponent
- Also need an abstract TryGetSlot function for SharedInventoryComponent

* better TryGetSlot

* Ah yes, tests exist.
This commit is contained in:
Leon Friedrich
2021-12-26 17:07:28 +13:00
committed by GitHub
parent 32d752bfa6
commit b675bdb789
27 changed files with 90 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Doors/Components/ServerDoorComponent.cs
View File

@@ -3,8 +3,6 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Content.Server.Access;
using Content.Server.Access.Components;
using Content.Server.Access.Systems;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Construction;
@@ -13,6 +11,8 @@ using Content.Server.Hands.Components;
using Content.Server.Stunnable;
using Content.Server.Tools;
using Content.Server.Tools.Components;
using Content.Shared.Access.Components;
using Content.Shared.Access.Systems;
using Content.Shared.Damage;
using Content.Shared.Doors;
using Content.Shared.Interaction;
@@ -310,7 +310,7 @@ namespace Content.Server.Doors.Components
return false;
}
if (!_entMan.TryGetComponent(Owner, out AccessReader? access))
if (!_entMan.TryGetComponent(Owner, out AccessReaderComponent? access))
{
return true;
}
@@ -334,7 +334,7 @@ namespace Content.Server.Doors.Components
/// </summary>
private bool HasAccessType(string accessType)
{
if (_entMan.TryGetComponent(Owner, out AccessReader? access))
if (_entMan.TryGetComponent(Owner, out AccessReaderComponent? access))
{
return access.AccessLists.Any(list => list.Contains(accessType));
}
@@ -445,7 +445,7 @@ namespace Content.Server.Doors.Components
return false;
}
if (!_entMan.TryGetComponent(Owner, out AccessReader? access))
if (!_entMan.TryGetComponent(Owner, out AccessReaderComponent? access))
{
return true;
}