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

Fix BagOpenCloseVisualizer failing with null rsi and redundant sprite component in CigPackBase

Browse Source
This commit is contained in:
DrSmugleaf
2021-02-22 14:39:39 +01:00
parent 17448df1fe
commit be1e0abeac
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/GameObjects/Components/Storage/BagOpenCloseVisualizer.cs
View File

@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Log;
using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel;
using static Robust.Shared.Utility.SpriteSpecifier;
namespace Content.Client.GameObjects.Components.Storage
{
@@ -34,11 +35,12 @@ namespace Content.Client.GameObjects.Components.Storage
{
base.InitializeEntity(entity);
if (_openIcon != null && entity.TryGetComponent<SpriteComponent>(out var spriteComponent))
if (_openIcon != null &&
entity.TryGetComponent<SpriteComponent>(out var spriteComponent) &&
spriteComponent.BaseRSI?.Path != null)
{
var rsiPath = spriteComponent.BaseRSI!.Path!;
spriteComponent.LayerMapReserveBlank(OpenIcon);
spriteComponent.LayerSetSprite(OpenIcon, new SpriteSpecifier.Rsi(rsiPath, _openIcon));
spriteComponent.LayerSetSprite(OpenIcon, new Rsi(spriteComponent.BaseRSI.Path, _openIcon));
spriteComponent.LayerSetVisible(OpenIcon, false);
}
}