Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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/Climbing/Components/ClimbableComponent.cs
View File

@@ -74,7 +74,7 @@ namespace Content.Server.Climbing.Components
return false;
}
if (!user.HasComponent<ClimbingComponent>() ||
if (!IoCManager.Resolve<IEntityManager>().HasComponent<ClimbingComponent>(user.Uid) ||
!user.TryGetComponent(out SharedBodyComponent? body))
{
reason = Loc.GetString("comp-climbable-cant-climb");
@@ -114,7 +114,7 @@ namespace Content.Server.Climbing.Components
return false;
}
if (target == null || !dragged.HasComponent<ClimbingComponent>())
if (target == null || !IoCManager.Resolve<IEntityManager>().HasComponent<ClimbingComponent>(dragged.Uid))
{
reason = Loc.GetString("comp-climbable-cant-climb");
return false;