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

Use ActionBlockerSystem as a dependency on CGSystem

Browse Source
This commit is contained in:
metalgearsloth
2021-10-27 01:07:19 +11:00
parent d1a830cd74
commit 9c3a603e7e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Construction/ConstructionSystem.cs
View File

@@ -42,6 +42,7 @@ namespace Content.Server.Construction
[Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly StackSystem _stackSystem = default!; [Dependency] private readonly StackSystem _stackSystem = default!;
[Dependency] private readonly ActionBlockerSystem _blockerSystem = default!;
private readonly Dictionary<ICommonSession, HashSet<int>> _beingBuilt = new(); private readonly Dictionary<ICommonSession, HashSet<int>> _beingBuilt = new();
@@ -389,7 +390,7 @@ namespace Content.Server.Construction
var user = args.SenderSession.AttachedEntity; var user = args.SenderSession.AttachedEntity;
if (user == null || !Get<ActionBlockerSystem>().CanInteract(user)) return; if (user == null || !_blockerSystem.CanInteract(user)) return;
if (!user.TryGetComponent(out HandsComponent? hands)) return; if (!user.TryGetComponent(out HandsComponent? hands)) return;
@@ -490,7 +491,7 @@ namespace Content.Server.Construction
} }
if (user == null if (user == null
|| !Get<ActionBlockerSystem>().CanInteract(user) || !_blockerSystem.CanInteract(user)
|| !user.TryGetComponent(out HandsComponent? hands) || hands.GetActiveHand == null || !user.TryGetComponent(out HandsComponent? hands) || hands.GetActiveHand == null
|| !user.InRangeUnobstructed(ev.Location, ignoreInsideBlocker:constructionPrototype.CanBuildInImpassable)) || !user.InRangeUnobstructed(ev.Location, ignoreInsideBlocker:constructionPrototype.CanBuildInImpassable))
{ {