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

Fix EntityWhitelist not taking into account ignored components

Browse Source
This commit is contained in:
Kara Dinyes
2021-07-24 15:46:44 -07:00
parent 84616743e9
commit dcc9f02e55
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Shared/Whitelist/EntityWhitelist.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.Tag; using Content.Shared.Tag;
using Content.Shared.Wires;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
@@ -50,13 +51,16 @@ namespace Content.Shared.Whitelist
_registrations = new List<IComponentRegistration>(); _registrations = new List<IComponentRegistration>();
foreach (var name in Components) foreach (var name in Components)
{ {
if (!compfact.TryGetRegistration(name, out var registration)) var availability = compfact.GetComponentAvailability(name);
if (compfact.TryGetRegistration(name, out var registration)
&& availability == ComponentAvailability.Available)
{ {
Logger.Warning($"Invalid component name {name} passed to EntityWhitelist!"); _registrations.Add(registration);
continue; }
else if (availability == ComponentAvailability.Unknown)
{
Logger.Warning($"Unknown component name {name} passed to EntityWhitelist!");
} }
_registrations.Add(registration);
} }
} }
@@ -75,7 +79,7 @@ namespace Content.Shared.Whitelist
{ {
foreach (var reg in _registrations) foreach (var reg in _registrations)
{ {
if (entity.TryGetComponent(reg.Type, out _)) if (entity.HasComponent(reg.Type))
return true; return true;
} }
} }