tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

4
Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Gravity;
using Content.Shared.StepTrigger.Components;
using Content.Shared.Whitelist;
using Robust.Shared.Map.Components;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
@@ -12,6 +13,7 @@ public sealed class StepTriggerSystem : EntitySystem
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
[Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
public override void Initialize()
{
@@ -67,7 +69,7 @@ public sealed class StepTriggerSystem : EntitySystem
if (ent == uid)
continue;
if (component.Blacklist.IsValid(ent.Value, EntityManager) == true)
if (_whitelistSystem.IsBlacklistPass(component.Blacklist, ent.Value))
{
return false;
}