tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

6
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
View File

@@ -53,17 +53,17 @@ namespace Content.Shared.Disposal
return false;
// TODO: Probably just need a disposable tag.
if (!entity.TryGetComponent(out SharedItemComponent? storable) &&
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SharedItemComponent? storable) &&
!IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity.Uid))
{
return false;
}
if (!entity.TryGetComponent(out IPhysBody? physics) ||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? physics) ||
!physics.CanCollide && storable == null)
{
if (!(entity.TryGetComponent(out MobStateComponent? damageState) && damageState.IsDead()))
if (!(IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out MobStateComponent? damageState) && damageState.IsDead()))
{
return false;
}