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

Make CuffableComponent and CuffableSystem not Crash (Hopefully) (#39123)

Browse Source 
* This system is ancient

* Destroy that API

* Address reviews

* Destroy merge conflicts from orbit

* seems to work fine

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-11-01 06:22:13 -07:00
committed by GitHub
parent 3d095c8eed
commit 04b71d8203
6 changed files with 89 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Strip/SharedStrippableSystem.cs
View File

@@ -128,10 +128,10 @@ public abstract class SharedStrippableSystem : EntitySystem
// Is the target a handcuff?
if (TryComp<VirtualItemComponent>(heldEntity, out var virtualItem) &&
TryComp<CuffableComponent>(target.Owner, out var cuffable) &&
_cuffableSystem.GetAllCuffs(cuffable).Contains(virtualItem.BlockingEntity))
_cuffableSystem.TryGetAllCuffs(target.Owner, out var cuffs) &&
cuffs.Contains(virtualItem.BlockingEntity))
{
_cuffableSystem.TryUncuff(target.Owner, user, virtualItem.BlockingEntity, cuffable);
_cuffableSystem.TryUncuff(target.Owner, user, virtualItem.BlockingEntity);
return;
}