Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Inline HasComponent entirely

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 12:23:18 +01:00
parent 88141ae6b8
commit 0feebbff00
117 changed files with 201 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Strip/StrippableComponent.cs
View File

@@ -133,7 +133,7 @@ namespace Content.Server.Strip
{
var owner = hands.GetItem(hand)?.Owner;
if (owner?.HasComponent<HandVirtualItemComponent>() ?? true)
if ((owner != null ? IoCManager.Resolve<IEntityManager>().HasComponent<HandVirtualItemComponent>(owner.Uid) : (bool?) null) ?? true)
{
dictionary[hand] = "None";
continue;
@@ -359,7 +359,7 @@ namespace Content.Server.Strip
return false;
}
if (heldItem.Owner.HasComponent<HandVirtualItemComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<HandVirtualItemComponent>(heldItem.Owner.Uid))
return false;
if (!hands.CanDrop(hand, false))