From 8204d33a85deb5855780740577beee9b5ae84148 Mon Sep 17 00:00:00 2001 From: ike709 Date: Sun, 7 Mar 2021 18:15:31 -0600 Subject: [PATCH] Makes join/leave messages admin-only (#3565) Co-authored-by: ike709 --- Content.Server/GameTicking/GameTicker.cs | 5 +++-- Resources/Locale/en-US/admin.ftl | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/admin.ftl diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 4ac1fdd2ba..27da6a7d8c 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -766,7 +766,7 @@ namespace Content.Server.GameTicking case SessionStatus.Connected: { - _chatManager.DispatchServerAnnouncement($"Player {args.Session.Name} joined server!"); + _chatManager.SendAdminAnnouncement(Loc.GetString("player-join-message", ("name", args.Session.Name))); if (LobbyEnabled && _roundStartCountdownHasNotStartedYetDueToNoPlayers) { @@ -813,7 +813,8 @@ namespace Content.Server.GameTicking { if (_playersInLobby.ContainsKey(session)) _playersInLobby.Remove(session); - _chatManager.DispatchServerAnnouncement($"Player {args.Session} left server!"); + _chatManager.SendAdminAnnouncement(Loc.GetString("player-leave-message", ("name", args.Session.Name))); + ServerEmptyUpdateRestartCheck(); _prefsManager.OnClientDisconnected(session); break; diff --git a/Resources/Locale/en-US/admin.ftl b/Resources/Locale/en-US/admin.ftl new file mode 100644 index 0000000000..05454a16f1 --- /dev/null +++ b/Resources/Locale/en-US/admin.ftl @@ -0,0 +1,8 @@ + +### Admin + +# Displayed in chat to admins when a player joins +player-join-message = Player {$name} joined the server! + +# Displayed in chat to admins when a player leaves +player-leave-message = Player {$name} left the server!