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

Fix character ui crash (#8717)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-09 14:40:48 +12:00
committed by GitHub
parent 11db9462f1
commit 2d38d35aa2
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
View File

@@ -81,13 +81,18 @@ namespace Content.Client.CharacterInterface
return;
_gameHud.CharacterButtonVisible = true;
_gameHud.CharacterButtonToggled += b =>
_gameHud.CharacterButtonToggled += ToggleWindow;
}
private void ToggleWindow(bool toggle)
{
if (b)
comp.Window.OpenCentered();
if (!TryComp(_playerManager.LocalPlayer?.Session?.AttachedEntity, out CharacterInterfaceComponent? comp))
return;
if (toggle)
comp.Window?.OpenCentered();
else
comp.Window.Close();
};
comp.Window?.Close();
}
private void OnPlayerDetached(EntityUid uid, CharacterInterfaceComponent comp, PlayerDetachedEvent args)
@@ -96,6 +101,7 @@ namespace Content.Client.CharacterInterface
return;
_gameHud.CharacterButtonVisible = false;
_gameHud.CharacterButtonToggled -= ToggleWindow;
comp.Window.Close();
}