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

Fix ItemMapper whitelist mispredict when inserting or removing items (#29461)

Browse Source 
* Fix ItemMapper whitelist mispredict when inserting or removing items

Makes the ItemMapper MapLayerData available on client so that the client
can predict whether an inserted/removed item changes the visibility of
a sprite layer.

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
ShadowCommander
2024-06-29 21:34:06 -07:00
committed by GitHub
parent 3aa6270de6
commit afe9f3ae85
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,21 +17,21 @@ namespace Content.Shared.Storage.Components
{ {
public string Layer = string.Empty; public string Layer = string.Empty;
[DataField("whitelist", required: true, serverOnly: true)] [DataField(required: true)]
public EntityWhitelist ServerWhitelist { get; set; } = new(); public EntityWhitelist? Whitelist { get; set; }
/// <summary> /// <summary>
/// Minimal amount of entities that are valid for whitelist. /// Minimal amount of entities that are valid for whitelist.
/// If it's smaller than minimal amount, layer will be hidden. /// If it's smaller than minimal amount, layer will be hidden.
/// </summary> /// </summary>
[DataField("minCount")] [DataField]
public int MinCount = 1; public int MinCount = 1;
/// <summary> /// <summary>
/// Max amount of entities that are valid for whitelist. /// Max amount of entities that are valid for whitelist.
/// If it's bigger than max amount, layer will be hidden. /// If it's bigger than max amount, layer will be hidden.
/// </summary> /// </summary>
[DataField("maxCount")] [DataField]
public int MaxCount = int.MaxValue; public int MaxCount = int.MaxValue;
} }

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

@@ -95,7 +95,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 => _whitelistSystem.IsWhitelistPass(mapLayerData.ServerWhitelist, ent)); var count = containedLayers.Count(ent => _whitelistSystem.IsWhitelistPass(mapLayerData.Whitelist, ent));
if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount) if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount)
{ {
list.Add(mapLayerData.Layer); list.Add(mapLayerData.Layer);