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

ActionBlocker CanSpeak uses EntityUid exclusively

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:21:52 +01:00
parent c68c3219f8
commit 190612a350
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Actions/Actions/ScreamAction.cs
View File

@@ -41,7 +41,7 @@ namespace Content.Server.Actions.Actions
public void DoInstantAction(InstantActionEventArgs args)
{
if (!EntitySystem.Get<ActionBlockerSystem>().CanSpeak(args.Performer)) return;
if (!EntitySystem.Get<ActionBlockerSystem>().CanSpeak(args.Performer.Uid)) return;
if (!args.Performer.TryGetComponent<HumanoidAppearanceComponent>(out var humanoid)) return;
if (!args.Performer.TryGetComponent<SharedActionsComponent>(out var actions)) return;

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

@@ -110,7 +110,7 @@ namespace Content.Server.Chat.Managers
public void EntitySay(IEntity source, string message)
{
if (!EntitySystem.Get<ActionBlockerSystem>().CanSpeak(source))
if (!EntitySystem.Get<ActionBlockerSystem>().CanSpeak(source.Uid))
{
return;
}