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

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

@@ -17,7 +17,7 @@ namespace Content.Server.PowerCell.Components
public override bool IsEntityCompatible(IEntity entity)
{
return entity.HasComponent<BatteryComponent>();
return IoCManager.Resolve<IEntityManager>().HasComponent<BatteryComponent>(entity.Uid);
}
protected override BatteryComponent GetBatteryFrom(IEntity entity)

2
Content.Server/PowerCell/PowerCellSystem.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.PowerCell
!args.CanAccess ||
!args.CanInteract ||
component.HasCell ||
!args.Using.HasComponent<PowerCellComponent>() ||
!IoCManager.Resolve<IEntityManager>().HasComponent<PowerCellComponent>(args.Using.Uid) ||
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;