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

Fix entityUid nullability for handcuffs and morgues (#5757)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-13 06:53:02 +13:00
committed by GitHub
parent 6ddaab1e41
commit 57fc442a8b
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Server.Morgue.Components
private string? _trayPrototypeId;
[ViewVariables]
private EntityUid _tray;
private EntityUid? _tray;
[ViewVariables]
public ContainerSlot? TrayContainer { get; private set; }
@@ -67,7 +67,7 @@ namespace Content.Server.Morgue.Components
public override Vector2 ContentsDumpPosition()
{
if (_tray != null)
return _entMan.GetComponent<TransformComponent>(_tray).WorldPosition;
return _entMan.GetComponent<TransformComponent>(_tray.Value).WorldPosition;
return base.ContentsDumpPosition();
}
@@ -103,15 +103,15 @@ namespace Content.Server.Morgue.Components
if (_tray == null)
{
_tray = _entMan.SpawnEntity(_trayPrototypeId, _entMan.GetComponent<TransformComponent>(Owner).Coordinates);
var trayComp = _tray.EnsureComponent<MorgueTrayComponent>();
var trayComp = _tray.Value.EnsureComponent<MorgueTrayComponent>();
trayComp.Morgue = Owner;
}
else
{
TrayContainer?.Remove(_tray);
TrayContainer?.Remove(_tray.Value);
}
_entMan.GetComponent<TransformComponent>(_tray).Coordinates = new EntityCoordinates(Owner, 0, -1);
_entMan.GetComponent<TransformComponent>(_tray.Value).Coordinates = new EntityCoordinates(Owner, 0, -1);
base.OpenStorage();
}
@@ -143,7 +143,7 @@ namespace Content.Server.Morgue.Components
if (_tray != null)
{
TrayContainer?.Insert(_tray);
TrayContainer?.Insert(_tray.Value);
}
}
@@ -155,7 +155,7 @@ namespace Content.Server.Morgue.Components
}
var entityLookup = IoCManager.Resolve<IEntityLookup>();
foreach (var entity in entityLookup.GetEntitiesIntersecting(_tray, flags: LookupFlags.None))
foreach (var entity in entityLookup.GetEntitiesIntersecting(_tray.Value, flags: LookupFlags.None))
{
yield return entity;
}