juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove outdated access reader method. (#19765)

Browse Source
This commit is contained in:
Leon Friedrich
2023-09-03 13:05:22 +12:00
committed by GitHub
parent 182b5267ad
commit af79f369ae
14 changed files with 86 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Access/Systems/AccessOverriderSystem.cs
View File

@@ -260,6 +260,6 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
return true;
var privilegedId = component.PrivilegedIdSlot.Item;
return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, reader);
return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, reader);
}
}

2
Content.Server/Access/Systems/IdCardConsoleSystem.cs
View File

@@ -188,7 +188,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
return true;
var privilegedId = component.PrivilegedIdSlot.Item;
return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, reader);
return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, reader);
}
private void UpdateStationRecord(EntityUid uid, EntityUid targetId, string newFullName, string newJobTitle, JobPrototype? newJobProto)

8
Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
View File

@@ -322,13 +322,13 @@ public sealed class AirAlarmSystem : EntitySystem
UpdateUI(uid, component);
}
}
private void OnCopyDeviceData(EntityUid uid, AirAlarmComponent component, AirAlarmCopyDeviceDataMessage args)
{
if (!AccessCheck(uid, args.Session.AttachedEntity, component))
{
UpdateUI(uid, component);
return;
return;
}
switch (args.Data)
@@ -339,7 +339,7 @@ public sealed class AirAlarmSystem : EntitySystem
SetData(uid, addr, args.Data);
}
break;
case GasVentScrubberData scrubberData:
foreach (string addr in component.ScrubberData.Keys)
{
@@ -361,7 +361,7 @@ public sealed class AirAlarmSystem : EntitySystem
if (user == null)
return false;
if (!_access.IsAllowed(user.Value, reader))
if (!_access.IsAllowed(user.Value, uid, reader))
{
_popup.PopupEntity(Loc.GetString("air-alarm-ui-access-denied"), user.Value, user.Value);
return false;

2
Content.Server/Communications/CommunicationsConsoleSystem.cs
View File

@@ -174,7 +174,7 @@ namespace Content.Server.Communications
if (TryComp<AccessReaderComponent>(console, out var accessReaderComponent) && !HasComp<EmaggedComponent>(console))
{
return _accessReaderSystem.IsAllowed(user, accessReaderComponent);
return _accessReaderSystem.IsAllowed(user, console, accessReaderComponent);
}
return true;
}

2
Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
View File

@@ -192,7 +192,7 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
if (!TryComp(target, out AccessReaderComponent? reader) || user == null)
return true;
if (_accessSystem.IsAllowed(user.Value, reader))
if (_accessSystem.IsAllowed(user.Value, target, reader))
return true;
_audioSystem.PlayPvs(component.SoundNoAccess, user.Value, AudioParams.Default.WithVolume(-2f).WithPitchScale(1.2f));

2
Content.Server/MassMedia/Systems/NewsSystem.cs
View File

@@ -232,7 +232,7 @@ public sealed class NewsSystem : EntitySystem
{
if (EntityManager.TryGetComponent<AccessReaderComponent>(device, out var accessReader) &&
user.HasValue &&
_accessReader.IsAllowed(user.Value, accessReader))
_accessReader.IsAllowed(user.Value, device, accessReader))
{
return true;
}

4
Content.Server/Power/EntitySystems/ApcSystem.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Server.Power.EntitySystems
if (args.Session.AttachedEntity == null)
return;
if (access == null || _accessReader.IsAllowed(args.Session.AttachedEntity.Value, access))
if (access == null || _accessReader.IsAllowed(args.Session.AttachedEntity.Value, uid, access))
{
component.HasAccess = true;
}
@@ -82,7 +82,7 @@ namespace Content.Server.Power.EntitySystems
if (args.Session.AttachedEntity == null)
return;
if (access == null || _accessReader.IsAllowed(args.Session.AttachedEntity.Value, access))
if (access == null || _accessReader.IsAllowed(args.Session.AttachedEntity.Value, uid, access))
{
ApcToggleBreaker(uid, component);
}

2
Content.Server/Research/Systems/ResearchSystem.Console.cs
View File

@@ -25,7 +25,7 @@ public sealed partial class ResearchSystem
if (!this.IsPowered(uid, EntityManager))
return;
if (TryComp<AccessReaderComponent>(uid, out var access) && !_accessReader.IsAllowed(ent, access))
if (TryComp<AccessReaderComponent>(uid, out var access) && !_accessReader.IsAllowed(ent, uid, access))
{
_popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), ent);
return;

2
Content.Server/VendingMachines/VendingMachineSystem.cs
View File

@@ -226,7 +226,7 @@ namespace Content.Server.VendingMachines
if (!TryComp<AccessReaderComponent?>(uid, out var accessReader))
return true;
if (_accessReader.IsAllowed(sender, accessReader) || HasComp<EmaggedComponent>(uid))
if (_accessReader.IsAllowed(sender, uid, accessReader) || HasComp<EmaggedComponent>(uid))
return true;
Popup.PopupEntity(Loc.GetString("vending-machine-component-try-eject-access-denied"), uid);