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

Replace obsolete EntityWhitelist IsValid usages part 2 (#28506)

Browse Source
This commit is contained in:
Plykiya
2024-06-03 14:40:03 -07:00
committed by GitHub
parent 2bd4f85966
commit c5ff647ca6
42 changed files with 141 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Objectives.Components;
using Content.Shared.Objectives.Components;
using Content.Shared.Whitelist;
namespace Content.Server.Objectives.Systems;
@@ -8,6 +9,8 @@ namespace Content.Server.Objectives.Systems;
/// </summary>
public sealed class ObjectiveBlacklistRequirementSystem : EntitySystem
{
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
public override void Initialize()
{
base.Initialize();
@@ -22,7 +25,7 @@ public sealed class ObjectiveBlacklistRequirementSystem : EntitySystem
foreach (var objective in args.Mind.AllObjectives)
{
if (comp.Blacklist.IsValid(objective, EntityManager))
if (_whitelistSystem.IsBlacklistPass(comp.Blacklist, objective))
{
args.Cancelled = true;
return;