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

Replace obsolete EntityWhitelist IsValid usages (#28465)

Browse Source 
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya
2024-06-01 20:10:24 -07:00
committed by GitHub
parent dce68e48e8
commit d6ba166d3b
31 changed files with 186 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
View File

@@ -6,6 +6,7 @@ using Content.Shared.Interaction;
using Content.Shared.Popups;
using Content.Shared.Stacks;
using Content.Shared.Verbs;
using Content.Shared.Whitelist;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
@@ -30,6 +31,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly SharedStackSystem _stack = default!;
[Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
[ValidatePrototypeId<EntityPrototype>] public const string EffectProto = "FultonEffect";
protected static readonly Vector2 EffectOffset = Vector2.Zero;
@@ -176,7 +178,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
if (!CanFulton(targetUid))
return false;
if (component.Whitelist?.IsValid(targetUid, EntityManager) != true)
if (_whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, targetUid))
return false;
return true;