Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
View File

@@ -129,7 +129,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{
if (eventArgs.Using.HasComponent<AmmoComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<AmmoComponent>(eventArgs.Using.Uid))
{
return TryInsertAmmo(eventArgs.User, eventArgs.Using);
}

2
Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs
View File

@@ -87,7 +87,7 @@ namespace Content.Server.Weapon.Ranged.Barrels
!args.CanAccess ||
!args.CanInteract ||
component.PowerCell != null ||
!args.Using.HasComponent<BatteryComponent>() ||
!IoCManager.Resolve<IEntityManager>().HasComponent<BatteryComponent>(args.Using.Uid) ||
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;

4
Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
View File

@@ -206,7 +206,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return false;
}
if (!entity.HasComponent<BatteryComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<BatteryComponent>(entity.Uid))
{
return false;
}
@@ -267,7 +267,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
public override async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
{
if (!eventArgs.Using.HasComponent<BatteryComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<BatteryComponent>(eventArgs.Using.Uid))
{
return false;
}

2
Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
View File

@@ -225,7 +225,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
FireHitscan(shooter, hitscan, angle);
}
else if (projectile.HasComponent<ProjectileComponent>() &&
else if (IoCManager.Resolve<IEntityManager>().HasComponent<ProjectileComponent>(projectile.Uid) &&
ammo != null &&
ammo.TryGetComponent(out AmmoComponent? ammoComponent))
{