juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions 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

6
Content.Server/Pointing/EntitySystems/PointingSystem.cs
View File

@@ -80,7 +80,7 @@ namespace Content.Server.Pointing.EntitySystems
public bool InRange(IEntity pointer, EntityCoordinates coordinates)
{
if (pointer.HasComponent<GhostComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(pointer.Uid))
{
return pointer.Transform.Coordinates.InRange(EntityManager, coordinates, 15);
}
@@ -105,7 +105,7 @@ namespace Content.Server.Pointing.EntitySystems
return false;
}
if (EntityManager.TryGetEntity(uid, out var entity) && entity.HasComponent<PointingArrowComponent>())
if (EntityManager.TryGetEntity(uid, out var entity) && IoCManager.Resolve<IEntityManager>().HasComponent<PointingArrowComponent>(entity.Uid))
{
// this is a pointing arrow. no pointing here...
return false;
@@ -200,7 +200,7 @@ namespace Content.Server.Pointing.EntitySystems
return;
//Check if the object is already being pointed at
if (args.Target.HasComponent<PointingArrowComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<PointingArrowComponent>(args.Target.Uid))
return;
if (!args.User.TryGetComponent<ActorComponent>(out var actor) ||