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

Deprecate IActionBlocker in favour of cancellable events (#4193)

Browse Source 
* Deprecate IActionBlocker in favour of cancellable events

* Bring back old speech/emoting component restrictions

* Rename action blocker listener methods

* Use Entity System public methods instead of extension methods

Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
This commit is contained in:
DrSmugleaf
2021-06-19 10:03:24 +02:00
committed by GitHub
parent e1e54e9cb1
commit 9b8185db23
98 changed files with 673 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
View File

@@ -2,6 +2,7 @@
using Content.Server.Body.Surgery.Messages;
using Content.Shared.ActionBlocker;
using Content.Shared.GameTicking;
using Content.Shared.Interaction.Events;
using Content.Shared.Interaction.Helpers;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
@@ -52,7 +53,7 @@ namespace Content.Server.Body.Surgery.Components
continue;
}
if (!ActionBlockerSystem.CanInteract(tool.PerformerCache) ||
if (!Get<ActionBlockerSystem>().CanInteract(tool.PerformerCache) ||
!tool.PerformerCache.InRangeUnobstructed(tool.BodyCache))
{
tool.CloseAllSurgeryUIs();