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

Fix crematorium visualizer crash (#2513)

Browse Source 
* Fix crematorium visualizer crash

* Also morgue

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-11-07 14:44:47 +11:00
committed by GitHub
parent bf5b9ad03b
commit 54e0747577
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs
View File

@@ -44,12 +44,14 @@ namespace Content.Client.GameObjects.Components.Storage
if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite)) return; if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite)) return;
sprite.LayerSetState( if (component.TryGetData(MorgueVisuals.Open, out bool open))
CrematoriumVisualLayers.Base, {
component.GetData<bool>(MorgueVisuals.Open) sprite.LayerSetState(CrematoriumVisualLayers.Base, open ? _stateOpen : _stateClosed);
? _stateOpen }
: _stateClosed else
); {
sprite.LayerSetState(CrematoriumVisualLayers.Base, _stateClosed);
}
var lightState = ""; var lightState = "";
if (component.TryGetData(MorgueVisuals.HasContents, out bool hasContents) && hasContents) lightState = _lightContents; if (component.TryGetData(MorgueVisuals.HasContents, out bool hasContents) && hasContents) lightState = _lightContents;

14
Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs
View File

@@ -49,12 +49,14 @@ namespace Content.Client.GameObjects.Components.Storage
if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite)) return; if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite)) return;
sprite.LayerSetState( if (component.TryGetData(MorgueVisuals.Open, out bool open))
MorgueVisualLayers.Base, {
component.GetData<bool>(MorgueVisuals.Open) sprite.LayerSetState(MorgueVisualLayers.Base, open ? _stateOpen : _stateClosed);
? _stateOpen }
: _stateClosed else
); {
sprite.LayerSetState(MorgueVisualLayers.Base, _stateClosed);
}
var lightState = ""; var lightState = "";
if (component.TryGetData(MorgueVisuals.HasContents, out bool hasContents) && hasContents) lightState = _lightContents; if (component.TryGetData(MorgueVisuals.HasContents, out bool hasContents) && hasContents) lightState = _lightContents;