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

Asay for Meaty Ores

Browse Source
This commit is contained in:
rhailrake
2023-04-28 04:44:00 +06:00
committed by Aviu00
parent 0c17665f7f
commit 07bc0bb754
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,13 +293,15 @@ namespace Content.Server.Chat.Managers
private void SendAdminChat(ICommonSession player, string message) private void SendAdminChat(ICommonSession player, string message)
{ {
if (!_adminManager.IsAdmin(player)) if (!_adminManager.HasAdminFlag(player, AdminFlags.Admin))
{ {
_adminLogger.Add(LogType.Chat, LogImpact.Extreme, $"{player:Player} attempted to send admin message but was not admin"); _adminLogger.Add(LogType.Chat, LogImpact.Extreme, $"{player:Player} attempted to send admin message but was not admin");
return; return;
} }
var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); var clients = _adminManager.ActiveAdmins
.Where(p => _adminManager.HasAdminFlag(p, AdminFlags.Admin))
.Select(p => p.Channel);
var wrappedMessage = Loc.GetString("chat-manager-send-admin-chat-wrap-message", var wrappedMessage = Loc.GetString("chat-manager-send-admin-chat-wrap-message",
("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
("playerName", player.Name), ("message", FormattedMessage.EscapeText(message))); ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));

3
Content.Server/Chat/Systems/ChatSystem.cs
View File

@@ -10,6 +10,7 @@ using Content.Server.Station.Components;
using Content.Server.Station.Systems; using Content.Server.Station.Systems;
using Content.Server.UtkaIntegration; using Content.Server.UtkaIntegration;
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.Administration;
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Content.Shared.Chat; using Content.Shared.Chat;
using Content.Shared.Database; using Content.Shared.Database;
@@ -605,7 +606,7 @@ public sealed partial class ChatSystem : SharedChatSystem
{ {
var name = FormattedMessage.EscapeText(Identity.Name(source, EntityManager)); var name = FormattedMessage.EscapeText(Identity.Name(source, EntityManager));
if (_adminManager.IsAdmin(player)) if (_adminManager.HasAdminFlag(player, AdminFlags.Admin))
{ {
if (!AdminLoocEnabled) if (!AdminLoocEnabled)
return; return;