diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 776dfe7450..28cb8c950a 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -50,7 +50,7 @@ internal sealed partial class ChatManager : IChatManager [Dependency] private ILogManager _logManager = default!; [Dependency] private ILocalizationManager _localizationManager = default!; - private ISawmill _sawmill = default!; + private ISawmill? _sawmill = default!; /// /// The maximum length a player-sent message can be sent @@ -119,8 +119,11 @@ internal sealed partial class ChatManager : IChatManager { var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message))); ChatMessageToAll(ChatChannel.Server, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride); - _sawmill.Info(message); + // _sawmill might have not been initialized when DispatchServerAnnouncement is called + // during server setup when some cvars are changed + _sawmill?.Info(message); + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}"); }