From 9e000fa5cd8383ff8dc6ee66cf5000a011c8eafc Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Wed, 14 May 2025 18:01:54 -0400 Subject: [PATCH] Cleanup warnings in `RgbLightControllerSystem` (#37458) Cleanup warnings in RgbLightControllerSystem --- Content.Client/Light/RgbLightControllerSystem.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs index 85b6114830..9977a35118 100644 --- a/Content.Client/Light/RgbLightControllerSystem.cs +++ b/Content.Client/Light/RgbLightControllerSystem.cs @@ -18,6 +18,7 @@ namespace Content.Client.Light [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly ItemSystem _itemSystem = default!; [Dependency] private readonly SharedPointLightSystem _lights = default!; + [Dependency] private readonly SpriteSystem _sprite = default!; public override void Initialize() { @@ -75,7 +76,7 @@ namespace Content.Client.Light foreach (var key in args.RevealedLayers) { - if (!sprite.LayerMapTryGet(key, out var index) || sprite[index] is not Layer layer) + if (!_sprite.LayerMapTryGet((args.User, sprite), key, out var index, false) || sprite[index] is not Layer layer) continue; if (layer.ShaderPrototype == "unshaded") @@ -93,7 +94,7 @@ namespace Content.Client.Light foreach (var key in args.RevealedLayers) { - if (!sprite.LayerMapTryGet(key, out var index) || sprite[index] is not Layer layer) + if (!_sprite.LayerMapTryGet((args.Equipee, sprite), key, out var index, false) || sprite[index] is not Layer layer) continue; if (layer.ShaderPrototype == "unshaded") @@ -164,7 +165,7 @@ namespace Content.Client.Light foreach (var (layer, color) in rgb.OriginalLayerColors) { - sprite.LayerSetColor(layer, color); + _sprite.LayerSetColor((uid, sprite), layer, color); } } @@ -181,7 +182,7 @@ namespace Content.Client.Light { foreach (var index in rgb.Layers) { - if (sprite.TryGetLayer(index, out var layer)) + if (_sprite.TryGetLayer((uid, sprite), index, out var layer, false)) layer.Color = color; } } @@ -192,8 +193,8 @@ namespace Content.Client.Light foreach (var layer in rgb.HolderLayers) { - if (holderSprite.LayerMapTryGet(layer, out var index)) - holderSprite.LayerSetColor(index, color); + if (_sprite.LayerMapTryGet((rgb.Holder.Value, holderSprite), layer, out var index, false)) + _sprite.LayerSetColor((rgb.Holder.Value, holderSprite), index, color); } }