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

Fix ItemMapper whitelist mispredict when inserting or removing items

Browse Source
This commit is contained in:
Jabak
2024-06-26 23:03:06 +03:00
parent 8712888e35
commit adc80ea566
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Storage/Components/SharedMapLayerData.cs
View File

@@ -17,8 +17,8 @@ namespace Content.Shared.Storage.Components
{ {
public string Layer = string.Empty; public string Layer = string.Empty;
[DataField("whitelist", required: true, serverOnly: true)] [DataField("whitelist", required: true)]
public EntityWhitelist ServerWhitelist { get; set; } = new(); public EntityWhitelist? ServerWhitelist { get; set; }
/// <summary> /// <summary>
/// Minimal amount of entities that are valid for whitelist. /// Minimal amount of entities that are valid for whitelist.

2
Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
View File

@@ -93,7 +93,7 @@ namespace Content.Shared.Storage.EntitySystems
var list = new List<string>(); var list = new List<string>();
foreach (var mapLayerData in itemMapper.MapLayers.Values) foreach (var mapLayerData in itemMapper.MapLayers.Values)
{ {
var count = containedLayers.Count(ent => mapLayerData.ServerWhitelist.IsValid(ent)); var count = containedLayers.Count(ent => mapLayerData.ServerWhitelist!.IsValid(ent));
if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount) if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount)
{ {
list.Add(mapLayerData.Layer); list.Add(mapLayerData.Layer);