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

14
Content.Server/Singularity/EntitySystems/SingularitySystem.cs
View File

@@ -102,10 +102,10 @@ namespace Content.Server.Singularity.EntitySystems
private bool CanDestroy(SharedSingularityComponent component, IEntity entity)
{
return entity == component.Owner ||
entity.HasComponent<IMapGridComponent>() ||
entity.HasComponent<GhostComponent>() ||
entity.HasComponent<ContainmentFieldComponent>() ||
entity.HasComponent<ContainmentFieldGeneratorComponent>();
IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity.Uid) ||
IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(entity.Uid) ||
IoCManager.Resolve<IEntityManager>().HasComponent<ContainmentFieldComponent>(entity.Uid) ||
IoCManager.Resolve<IEntityManager>().HasComponent<ContainmentFieldGeneratorComponent>(entity.Uid);
}
private void HandleDestroy(ServerSingularityComponent component, IEntity entity)
@@ -149,9 +149,9 @@ namespace Content.Server.Singularity.EntitySystems
private bool CanPull(IEntity entity)
{
return !(entity.HasComponent<GhostComponent>() ||
entity.HasComponent<IMapGridComponent>() ||
entity.HasComponent<MapComponent>() ||
return !(IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(entity.Uid) ||
IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity.Uid) ||
IoCManager.Resolve<IEntityManager>().HasComponent<MapComponent>(entity.Uid) ||
entity.IsInContainer());
}