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

Inline GetComponent

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:55:25 +01:00
parent c2e6da1e54
commit b835bea086
131 changed files with 363 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/PowerCell/Components/PowerCellChargerComponent.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.Power.Components;
using Content.Shared.Interaction;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.PowerCell.Components
{
@@ -21,7 +22,7 @@ namespace Content.Server.PowerCell.Components
protected override BatteryComponent GetBatteryFrom(IEntity entity)
{
return entity.GetComponent<BatteryComponent>();
return IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(entity.Uid);
}
}
}

2
Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
View File

@@ -134,7 +134,7 @@ namespace Content.Server.PowerCell.Components
//Dirty();
if (user != null)
{
if (!user.TryGetComponent(out HandsComponent? hands) || !hands.PutInHand(cell.Owner.GetComponent<ItemComponent>()))
if (!user.TryGetComponent(out HandsComponent? hands) || !hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(cell.Owner.Uid)))
{
cell.Owner.Transform.Coordinates = user.Transform.Coordinates;
}