From fa62ef50052d1cc6ed05d1610c38e6df13c1e513 Mon Sep 17 00:00:00 2001 From: AsnDen Date: Sun, 22 Sep 2024 16:23:47 +0300 Subject: [PATCH 1/2] HasAdminFlat -> IsAdmin --- Content.Server/Chat/Managers/ChatManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 02f718daef0e6e..7b376f01025e4c 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -245,7 +245,7 @@ private void SendOOC(ICommonSession player, string message) Color? colorOverride = null; var wrappedMessage = Loc.GetString("chat-manager-send-ooc-wrap-message", ("playerName",player.Name), ("message", FormattedMessage.EscapeText(message))); - if (_adminManager.HasAdminFlag(player, AdminFlags.Admin)) + if (_adminManager.IsAdmin(player)) { var prefs = _preferencesManager.GetPreferences(player.UserId); colorOverride = prefs.AdminOOCColor; From ab99715d79933bbcc06a9a4a8e2e6eb98e5b294a Mon Sep 17 00:00:00 2001 From: AsnDen Date: Sun, 22 Sep 2024 16:30:54 +0300 Subject: [PATCH 2/2] Actually it is better to check NameColor flag --- Content.Server/Chat/Managers/ChatManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 7b376f01025e4c..94629b23fec31c 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -245,7 +245,7 @@ private void SendOOC(ICommonSession player, string message) Color? colorOverride = null; var wrappedMessage = Loc.GetString("chat-manager-send-ooc-wrap-message", ("playerName",player.Name), ("message", FormattedMessage.EscapeText(message))); - if (_adminManager.IsAdmin(player)) + if (_adminManager.HasAdminFlag(player, AdminFlags.NameColor)) { var prefs = _preferencesManager.GetPreferences(player.UserId); colorOverride = prefs.AdminOOCColor;