From f025e5f0a8d998365909618c811152e995bcd1cd Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Tue, 9 Nov 2021 11:30:59 +0100 Subject: [PATCH] ChatManager ChatTransform uses EntityUid --- Content.Server/Chat/Managers/ChatManager.cs | 2 +- Content.Server/Chat/Managers/IChatManager.cs | 2 +- Content.Server/Speech/AccentSystem.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 542ff0321d..917a27213b 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -129,7 +129,7 @@ namespace Content.Server.Chat.Managers foreach (var handler in _chatTransformHandlers) { //TODO: rather return a bool and use a out var? - message = handler(source, message); + message = handler(source.Uid, message); } message = message.Trim(); diff --git a/Content.Server/Chat/Managers/IChatManager.cs b/Content.Server/Chat/Managers/IChatManager.cs index a163967ae2..0bc598020d 100644 --- a/Content.Server/Chat/Managers/IChatManager.cs +++ b/Content.Server/Chat/Managers/IChatManager.cs @@ -31,7 +31,7 @@ namespace Content.Server.Chat.Managers void SendHookOOC(string sender, string message); - delegate string TransformChat(IEntity speaker, string message); + delegate string TransformChat(EntityUid speaker, string message); void RegisterChatTransform(TransformChat handler); void SendAdminAnnouncement(string message); } diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs index 71b0ebf52f..65ea6c53eb 100644 --- a/Content.Server/Speech/AccentSystem.cs +++ b/Content.Server/Speech/AccentSystem.cs @@ -17,11 +17,11 @@ namespace Content.Server.Speech _chatManager.RegisterChatTransform(AccentHandler); } - public string AccentHandler(IEntity player, string message) + public string AccentHandler(EntityUid playerUid, string message) { - var accentEvent = new AccentGetEvent(player.Uid, message); + var accentEvent = new AccentGetEvent(playerUid, message); - RaiseLocalEvent(player.Uid, accentEvent); + RaiseLocalEvent(playerUid, accentEvent); return accentEvent.Message; }