]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cleanup warnings in `MaterialStorageSystem` (#37492)
authorTayrtahn <tayrtahn@gmail.com>
Thu, 15 May 2025 20:35:19 +0000 (16:35 -0400)
committerGitHub <noreply@github.com>
Thu, 15 May 2025 20:35:19 +0000 (16:35 -0400)
Cleanup warnings in MaterialStorageSystem

Content.Client/Materials/MaterialStorageSystem.cs

index 592471d6736d087c245dfc720e1332fbf17c4843..f9078a9032f2347fcd9e182c69be7632a6a9ea9a 100644 (file)
@@ -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<bool>(uid, MaterialStorageVisuals.Inserting, out var inserting, args.Component))
@@ -28,15 +29,15 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem
 
         if (inserting && TryComp<InsertingMaterialStorageComponent>(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);
         }
     }