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

8
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -8,14 +8,14 @@ using Content.Server.Items;
using Content.Server.MoMMI;
using Content.Server.Preferences.Managers;
using Content.Server.Radio.EntitySystems;
using Content.Shared;
using Content.Shared.ActionBlocker;
using Content.Shared.Administration;
using Content.Shared.CCVar;
using Content.Shared.Chat;
using Content.Shared.Emoting;
using Content.Shared.Inventory;
using Content.Shared.Notification;
using Content.Shared.Notification.Managers;
using Content.Shared.Speech;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Configuration;
@@ -122,7 +122,7 @@ namespace Content.Server.Chat.Managers
public void EntitySay(IEntity source, string message)
{
if (!ActionBlockerSystem.CanSpeak(source))
if (!EntitySystem.Get<ActionBlockerSystem>().CanSpeak(source))
{
return;
}
@@ -195,7 +195,7 @@ namespace Content.Server.Chat.Managers
public void EntityMe(IEntity source, string action)
{
if (!ActionBlockerSystem.CanEmote(source))
if (!EntitySystem.Get<ActionBlockerSystem>().CanEmote(source))
{
return;
}