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

6
Content.Shared/Storage/EntitySystems/BinSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared.Examine;
@@ -7,6 +7,7 @@ using Content.Shared.Interaction;
using Content.Shared.Item;
using Content.Shared.Storage.Components;
using Content.Shared.Verbs;
using Content.Shared.Whitelist;
using Robust.Shared.Containers;
using Robust.Shared.Network;
@@ -21,6 +22,7 @@ public sealed class BinSystem : EntitySystem
[Dependency] private readonly ISharedAdminLogManager _admin = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
public const string BinContainerId = "bin-container";
@@ -130,7 +132,7 @@ public sealed class BinSystem : EntitySystem
if (component.Items.Count >= component.MaxItems)
return false;
if (component.Whitelist != null && !component.Whitelist.IsValid(toInsert))
if (_whitelistSystem.IsWhitelistFail(component.Whitelist, toInsert))
return false;
_container.Insert(toInsert, component.ItemContainer);