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

2
Content.Server/Cuffs/Components/CuffableComponent.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Server.Cuffs.Components
/// <param name="prototype"></param>
public bool TryAddNewCuffs(IEntity user, IEntity handcuff)
{
if (!handcuff.HasComponent<HandcuffComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<HandcuffComponent>(handcuff.Uid))
{
Logger.Warning($"Handcuffs being applied to player are missing a {nameof(HandcuffComponent)}!");
return false;

3
Content.Server/Cuffs/Components/HandcuffComponent.cs
View File

@@ -12,6 +12,7 @@ using Content.Shared.Sound;
using Content.Shared.Stunnable;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Player;
@@ -198,7 +199,7 @@ namespace Content.Server.Cuffs.Components
{
var cuffTime = CuffTime;
if (target.HasComponent<StunnedComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<StunnedComponent>(target.Uid))
{
cuffTime = MathF.Max(0.1f, cuffTime - StunBonus);
}