From a3418d56d98540f3fe03f5e10c9dad7381b552b9 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Thu, 15 May 2025 16:35:19 -0400 Subject: [PATCH] Cleanup warnings in `MaterialStorageSystem` (#37492) Cleanup warnings in MaterialStorageSystem --- Content.Client/Materials/MaterialStorageSystem.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Content.Client/Materials/MaterialStorageSystem.cs b/Content.Client/Materials/MaterialStorageSystem.cs index 592471d673..f9078a9032 100644 --- a/Content.Client/Materials/MaterialStorageSystem.cs +++ b/Content.Client/Materials/MaterialStorageSystem.cs @@ -7,6 +7,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem { [Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private readonly SpriteSystem _sprite = default!; public override void Initialize() { @@ -20,7 +21,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem if (args.Sprite == null) return; - if (!args.Sprite.LayerMapTryGet(MaterialStorageVisualLayers.Inserting, out var layer)) + if (!_sprite.LayerMapTryGet((uid, args.Sprite), MaterialStorageVisualLayers.Inserting, out var layer, false)) return; if (!_appearance.TryGetData(uid, MaterialStorageVisuals.Inserting, out var inserting, args.Component)) @@ -28,15 +29,15 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem if (inserting && TryComp(uid, out var insertingComp)) { - args.Sprite.LayerSetAnimationTime(layer, 0f); + _sprite.LayerSetAnimationTime((uid, args.Sprite), layer, 0f); - args.Sprite.LayerSetVisible(layer, true); + _sprite.LayerSetVisible((uid, args.Sprite), layer, true); if (insertingComp.MaterialColor != null) - args.Sprite.LayerSetColor(layer, insertingComp.MaterialColor.Value); + _sprite.LayerSetColor((uid, args.Sprite), layer, insertingComp.MaterialColor.Value); } else { - args.Sprite.LayerSetVisible(layer, false); + _sprite.LayerSetVisible((uid, args.Sprite), layer, false); } } -- 2.51.2