Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 21:02:04 +01:00
parent 2a3b7d809d
commit ab9d0cc6d8
94 changed files with 568 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,8 @@ namespace Content.Server.Cuffs.Components
[ComponentReference(typeof(SharedHandcuffComponent))]
public class HandcuffComponent : SharedHandcuffComponent, IAfterInteract
{
[Dependency] private readonly IEntityManager _entities = default!;
/// <summary>
/// The time it takes to apply a <see cref="CuffedComponent"/> to an entity.
/// </summary>
@@ -146,7 +148,9 @@ namespace Content.Server.Cuffs.Components
{
if (_cuffing) return true;
if (eventArgs.Target == null || !EntitySystem.Get<ActionBlockerSystem>().CanUse(eventArgs.User) || !IoCManager.Resolve<IEntityManager>().TryGetComponent<CuffableComponent?>(eventArgs.Target, out var cuffed))
if (eventArgs.Target is not {Valid: true} target ||
!EntitySystem.Get<ActionBlockerSystem>().CanUse(eventArgs.User) ||
!_entities.TryGetComponent<CuffableComponent?>(eventArgs.Target.Value, out var cuffed))
{
return false;
}
@@ -163,7 +167,7 @@ namespace Content.Server.Cuffs.Components
return true;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(eventArgs.Target, out var hands))
if (!_entities.TryGetComponent<HandsComponent?>(target, out var hands))
{
eventArgs.User.PopupMessage(Loc.GetString("handcuff-component-target-has-no-hands-error",("targetName", eventArgs.Target)));
return true;
@@ -182,11 +186,11 @@ namespace Content.Server.Cuffs.Components
}
eventArgs.User.PopupMessage(Loc.GetString("handcuff-component-start-cuffing-target-message",("targetName", eventArgs.Target)));
eventArgs.User.PopupMessage(eventArgs.Target, Loc.GetString("handcuff-component-start-cuffing-by-other-message",("otherName", eventArgs.User)));
eventArgs.User.PopupMessage(target, Loc.GetString("handcuff-component-start-cuffing-by-other-message",("otherName", eventArgs.User)));
SoundSystem.Play(Filter.Pvs(Owner), StartCuffSound.GetSound(), Owner);
TryUpdateCuff(eventArgs.User, eventArgs.Target, cuffed);
TryUpdateCuff(eventArgs.User, target, cuffed);
return true;
}
@@ -197,7 +201,7 @@ namespace Content.Server.Cuffs.Components
{
var cuffTime = CuffTime;
if (IoCManager.Resolve<IEntityManager>().HasComponent<StunnedComponent>(target))
if (_entities.HasComponent<StunnedComponent>(target))
{
cuffTime = MathF.Max(0.1f, cuffTime - StunBonus);
}

8
Content.Server/Cuffs/CuffableSystem.cs
View File

@@ -55,7 +55,7 @@ namespace Content.Server.Cuffs
{
return;
}
if (!EntityManager.EntityExists(args.User)
if (!EntityManager.EntityExists(args.User))
{
// Should this even be possible?
args.Cancel();
@@ -66,7 +66,7 @@ namespace Content.Server.Cuffs
if (args.User == args.Target)
{
// This UncuffAttemptEvent check should probably be In MobStateSystem, not here?
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<MobStateComponent?>(userEntity, out var state))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<MobStateComponent?>(args.User, out var state))
{
// Manually check this.
if (state.IsIncapacitated())
@@ -83,14 +83,14 @@ namespace Content.Server.Cuffs
else
{
// Check if the user can interact.
if (!_actionBlockerSystem.CanInteract(userEntity))
if (!_actionBlockerSystem.CanInteract(args.User))
{
args.Cancel();
}
}
if (args.Cancelled)
{
_popupSystem.PopupEntity(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, Filter.Entities(userEntity));
_popupSystem.PopupEntity(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, Filter.Entities(args.User));
}
}