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

Make more uids nullable (#5794)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-26 15:32:45 +13:00
committed by GitHub
parent 83114de0e4
commit afc3ae6335
42 changed files with 161 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Body/UI/BodyScannerDisplay.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Client.Body.UI
{
public sealed class BodyScannerDisplay : SS14Window
{
private EntityUid _currentEntity;
private EntityUid? _currentEntity;
private SharedBodyPartComponent? _currentBodyPart;
public BodyScannerDisplay(BodyScannerBoundUserInterface owner)
@@ -104,9 +104,6 @@ namespace Content.Client.Body.UI
public void UpdateDisplay(EntityUid entity)
{
if(entity == null)
return;
_currentEntity = entity;
BodyPartList.Clear();
@@ -125,12 +122,7 @@ namespace Content.Client.Body.UI
public void BodyPartOnItemSelected(ItemListSelectedEventArgs args)
{
if (_currentEntity == null)
return;
var body = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SharedBodyComponent>(_currentEntity);
if (body == null)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedBodyComponent>(_currentEntity, out var body))
{
return;
}