Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

EntityWhitelist uses EntityUid

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:08:09 +01:00
parent 5d66a08ac9
commit 1f9e1c033f
8 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/HandLabeler/HandLabelerSystem.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.HandLabeler
private void AfterInteractOn(EntityUid uid, HandLabelerComponent handLabeler, AfterInteractEvent args)
{
if (args.Target == null || !handLabeler.Whitelist.IsValid(args.Target))
if (args.Target == null || !handLabeler.Whitelist.IsValid(args.Target.Uid))
return;
AddLabelTo(uid, handLabeler, args.Target, out string? result);

2
Content.Server/Pinpointer/ServerPinpointerSystem.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Server.Pinpointer
var l = new SortedList<float, EntityUid>();
foreach (var e in ents)
{
if (whitelist.IsValid(e))
if (whitelist.IsValid(e.Uid))
{
var dist = (e.Transform.WorldPosition - transform.WorldPosition).LengthSquared;
l.TryAdd(dist, e.Uid);

2
Content.Server/Storage/Components/ServerStorageComponent.cs
View File

@@ -135,7 +135,7 @@ namespace Content.Server.Storage.Components
return false;
}
if (_whitelist != null && !_whitelist.IsValid(entity))
if (_whitelist != null && !_whitelist.IsValid(entity.Uid))
{
return false;
}

4
Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
View File

@@ -20,10 +20,10 @@ namespace Content.Server.Storage.EntitySystems
var count = 0;
foreach (var entity in component.StoredEntities)
{
if (itemCounter.Count.IsValid(entity)) count++;
if (itemCounter.Count.IsValid(entity.Uid)) count++;
}
return count;
}
}
}
}

4
Content.Server/Storage/EntitySystems/ItemMapperSystem.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Server.Storage.EntitySystems
{
foreach (var entity in containedLayers)
{
if (mapLayerData.Whitelist.IsValid(entity))
if (mapLayerData.Whitelist.IsValid(entity.Uid))
{
list.Add(mapLayerData.Layer);
break;
@@ -40,4 +40,4 @@ namespace Content.Server.Storage.EntitySystems
return false;
}
}
}
}