Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

9
Content.Server/Hands/Components/HandsComponent.cs
View File

@@ -11,8 +11,9 @@ using Content.Server.Pulling;
using Content.Shared.ActionBlocker;
using Content.Shared.Audio;
using Content.Shared.Body.Part;
using Content.Shared.DragDrop;
using Content.Shared.Hands.Components;
using Content.Shared.Notification;
using Content.Shared.Item;
using Content.Shared.Notification.Managers;
using Content.Shared.Physics.Pull;
using Content.Shared.Pulling.Components;
@@ -224,7 +225,7 @@ namespace Content.Server.Hands.Components
public bool CanPutInHand(ItemComponent item, bool mobCheck = true)
{
if (mobCheck && !ActionBlockerSystem.CanPickup(Owner))
if (mobCheck && !EntitySystem.Get<ActionBlockerSystem>().CanPickup(Owner))
return false;
foreach (var handName in ActivePriorityEnumerable())
@@ -241,7 +242,7 @@ namespace Content.Server.Hands.Components
public bool CanPutInHand(ItemComponent item, string index, bool mobCheck = true)
{
if (mobCheck && !ActionBlockerSystem.CanPickup(Owner))
if (mobCheck && !EntitySystem.Get<ActionBlockerSystem>().CanPickup(Owner))
return false;
var hand = GetHand(index);
@@ -445,7 +446,7 @@ namespace Content.Server.Hands.Components
{
var hand = GetHand(name);
if (mobCheck && !ActionBlockerSystem.CanDrop(Owner))
if (mobCheck && !EntitySystem.Get<ActionBlockerSystem>().CanDrop(Owner))
return false;
if (hand?.Entity == null)