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

Even more resolve removals.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 17:32:32 +01:00
parent 684cb76173
commit cdc8336695
61 changed files with 364 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/PDA/PDAExtensions.cs
View File

@@ -19,18 +19,20 @@ namespace Content.Server.PDA
{
IdCardComponent? firstIdInPda = null;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(player, out HandsComponent? hands))
var entMan = IoCManager.Resolve<IEntityManager>();
if (entMan.TryGetComponent(player, out HandsComponent? hands))
{
foreach (var item in hands.GetAllHeldItems())
{
if (firstIdInPda == null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(item.Owner, out PDAComponent? pda) &&
entMan.TryGetComponent(item.Owner, out PDAComponent? pda) &&
pda.ContainedID != null)
{
firstIdInPda = pda.ContainedID;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(item.Owner, out IdCardComponent? card))
if (entMan.TryGetComponent(item.Owner, out IdCardComponent? card))
{
return card;
}
@@ -44,18 +46,18 @@ namespace Content.Server.PDA
IdCardComponent? firstIdInInventory = null;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(player, out InventoryComponent? inventory))
if (entMan.TryGetComponent(player, out InventoryComponent? inventory))
{
foreach (var item in inventory.GetAllHeldItems())
{
if (firstIdInInventory == null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(item, out PDAComponent? pda) &&
entMan.TryGetComponent(item, out PDAComponent? pda) &&
pda.ContainedID != null)
{
firstIdInInventory = pda.ContainedID;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(item, out IdCardComponent? card))
if (entMan.TryGetComponent(item, out IdCardComponent? card))
{
return card;
}