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

4
Content.Server/Buckle/Components/BuckleComponent.cs
View File

@@ -178,7 +178,7 @@ namespace Content.Server.Buckle.Components
}
}
if (!user.HasComponent<HandsComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<HandsComponent>(user.Uid))
{
user.PopupMessage(Loc.GetString("buckle-component-no-hands-message "));
return false;
@@ -325,7 +325,7 @@ namespace Content.Server.Buckle.Components
Appearance?.SetData(BuckleVisuals.Buckled, false);
if (Owner.HasComponent<KnockedDownComponent>()
if (IoCManager.Resolve<IEntityManager>().HasComponent<KnockedDownComponent>(Owner.Uid)
|| (_mobState?.IsIncapacitated() ?? false))
{
EntitySystem.Get<StandingStateSystem>().Down(Owner.Uid);

2
Content.Server/Buckle/Systems/StrapSystem.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Server.Buckle.Systems
// If the used entity is a person being pulled, prioritize this verb. Conversely, if it is
// just a held object, the user is probably just trying to sit down.
verb.Priority = args.Using.HasComponent<ActorComponent>() ? 1 : -1;
verb.Priority = IoCManager.Resolve<IEntityManager>().HasComponent<ActorComponent>(args.Using.Uid) ? 1 : -1;
args.Verbs.Add(verb);
}