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

Cleanup warnings in MaterialStorageSystem (#37492)

Browse Source 
Cleanup warnings in MaterialStorageSystem
This commit is contained in:
Tayrtahn
2025-05-15 16:35:19 -04:00
committed by GitHub
parent 5aea940bbc
commit a3418d56d9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Materials/MaterialStorageSystem.cs
View File

@@ -7,6 +7,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem
{ {
[Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly AppearanceSystem _appearance = default!;
[Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -20,7 +21,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem
if (args.Sprite == null) if (args.Sprite == null)
return; return;
if (!args.Sprite.LayerMapTryGet(MaterialStorageVisualLayers.Inserting, out var layer)) if (!_sprite.LayerMapTryGet((uid, args.Sprite), MaterialStorageVisualLayers.Inserting, out var layer, false))
return; return;
if (!_appearance.TryGetData<bool>(uid, MaterialStorageVisuals.Inserting, out var inserting, args.Component)) 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)) 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) if (insertingComp.MaterialColor != null)
args.Sprite.LayerSetColor(layer, insertingComp.MaterialColor.Value); _sprite.LayerSetColor((uid, args.Sprite), layer, insertingComp.MaterialColor.Value);
} }
else else
{ {
args.Sprite.LayerSetVisible(layer, false); _sprite.LayerSetVisible((uid, args.Sprite), layer, false);
} }
} }