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

23
Content.Server/Cuffs/Components/CuffableComponent.cs
View File

@@ -177,7 +177,7 @@ namespace Content.Server.Cuffs.Components
/// </summary>
/// <param name="user">The cuffed entity</param>
/// <param name="cuffsToRemove">Optional param for the handcuff entity to remove from the cuffed entity. If null, uses the most recently added handcuff entity.</param>
public async void TryUncuff(EntityUid user, EntityUid cuffsToRemove = default)
public async void TryUncuff(EntityUid user, EntityUid? cuffsToRemove = null)
{
if (_uncuffing) return;
@@ -194,7 +194,7 @@ namespace Content.Server.Cuffs.Components
}
else
{
if (!Container.ContainedEntities.Contains(cuffsToRemove))
if (!Container.ContainedEntities.Contains(cuffsToRemove.Value))
{
Logger.Warning("A user is trying to remove handcuffs that aren't in the owner's container. This should never happen!");
}
@@ -220,13 +220,6 @@ namespace Content.Server.Cuffs.Components
return;
}
// TODO: Why are we even doing this check?
if (!cuffsToRemove.InRangeUnobstructed(Owner))
{
Logger.Warning("Handcuffs being removed from player are obstructed or too far away! This should not happen!");
return;
}
user.PopupMessage(Loc.GetString("cuffable-component-start-removing-cuffs-message"));
if (isOwner)
@@ -258,16 +251,18 @@ namespace Content.Server.Cuffs.Components
{
SoundSystem.Play(Filter.Pvs(Owner), cuff.EndUncuffSound.GetSound(), Owner);
Container.ForceRemove(cuffsToRemove);
_entMan.GetComponent<TransformComponent>(cuffsToRemove).AttachToGridOrMap();
_entMan.GetComponent<TransformComponent>(cuffsToRemove).WorldPosition = _entMan.GetComponent<TransformComponent>(Owner).WorldPosition;
Container.ForceRemove(cuffsToRemove.Value);
var transform = _entMan.GetComponent<TransformComponent>(cuffsToRemove.Value);
transform.AttachToGridOrMap();
transform.WorldPosition = _entMan.GetComponent<TransformComponent>(Owner).WorldPosition;
if (cuff.BreakOnRemove)
{
cuff.Broken = true;
_entMan.GetComponent<MetaDataComponent>(cuffsToRemove).EntityName = cuff.BrokenName;
_entMan.GetComponent<MetaDataComponent>(cuffsToRemove).EntityDescription = cuff.BrokenDesc;
var meta = _entMan.GetComponent<MetaDataComponent>(cuffsToRemove.Value);
meta.EntityName = cuff.BrokenName;
meta.EntityDescription = cuff.BrokenDesc;
if (_entMan.TryGetComponent<SpriteComponent?>(cuffsToRemove, out var sprite) && cuff.BrokenState != null)
{