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

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ using Content.Server.Access.Components;
using Content.Server.Hands.Components;
using Content.Server.Inventory.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.PDA
{
@@ -18,18 +19,18 @@ namespace Content.Server.PDA
{
IdCardComponent? firstIdInPda = null;
if (player.TryGetComponent(out HandsComponent? hands))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(player.Uid, out HandsComponent? hands))
{
foreach (var item in hands.GetAllHeldItems())
{
if (firstIdInPda == null &&
item.Owner.TryGetComponent(out PDAComponent? pda) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(item.Owner.Uid, out PDAComponent? pda) &&
pda.ContainedID != null)
{
firstIdInPda = pda.ContainedID;
}
if (item.Owner.TryGetComponent(out IdCardComponent? card))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(item.Owner.Uid, out IdCardComponent? card))
{
return card;
}
@@ -43,18 +44,18 @@ namespace Content.Server.PDA
IdCardComponent? firstIdInInventory = null;
if (player.TryGetComponent(out InventoryComponent? inventory))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(player.Uid, out InventoryComponent? inventory))
{
foreach (var item in inventory.GetAllHeldItems())
{
if (firstIdInInventory == null &&
item.TryGetComponent(out PDAComponent? pda) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(item.Uid, out PDAComponent? pda) &&
pda.ContainedID != null)
{
firstIdInInventory = pda.ContainedID;
}
if (item.TryGetComponent(out IdCardComponent? card))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(item.Uid, out IdCardComponent? card))
{
return card;
}

8
Content.Server/PDA/PDASystem.cs
View File

@@ -112,7 +112,7 @@ namespace Content.Server.PDA
private bool OpenUI(PDAComponent pda, IEntity user)
{
if (!user.TryGetComponent(out ActorComponent? actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(user.Uid, out ActorComponent? actor))
return false;
var ui = pda.Owner.GetUIOrNull(PDAUiKey.Key);
@@ -123,7 +123,7 @@ namespace Content.Server.PDA
private void UpdatePDAAppearance(PDAComponent pda)
{
if (pda.Owner.TryGetComponent(out AppearanceComponent? appearance))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pda.Owner.Uid, out AppearanceComponent? appearance))
appearance.SetData(PDAVisuals.IDCardInserted, pda.ContainedID != null);
}
@@ -155,7 +155,7 @@ namespace Content.Server.PDA
break;
case PDAToggleFlashlightMessage _:
{
if (pda.Owner.TryGetComponent(out UnpoweredFlashlightComponent? flashlight))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pda.Owner.Uid, out UnpoweredFlashlightComponent? flashlight))
_unpoweredFlashlight.ToggleLight(flashlight);
break;
}
@@ -172,7 +172,7 @@ namespace Content.Server.PDA
}
case PDAShowUplinkMessage _:
{
if (pda.Owner.TryGetComponent(out UplinkComponent? uplink))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pda.Owner.Uid, out UplinkComponent? uplink))
_uplinkSystem.ToggleUplinkUI(uplink, msg.Session);
break;
}