From 9092cea7ef761a11e457827b7838a2fee603ccf2 Mon Sep 17 00:00:00 2001 From: PackmanDude Date: Mon, 15 Aug 2022 00:25:26 +0300 Subject: [PATCH] Apply fix from @punchready --- CHANGELOG.md | 1 + TShockAPI/Commands.cs | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 318e82b9..4637dc62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Updated server startup language to be more clear when encountering a fatal startup error. Now, the server gives more context as to what happened so that there's a better chance of people being able to help themselves. (@hakusaro) * Added `-worldevil ` command line argument (@NotGeri) * Added PlayerHasBuildPermission hook to PlayerHooks. (@AnzhelikaO, @Killia0) +* Prevent Server Broadcast to display prefix without a message. (@PackmanDude) ## TShock 4.5.17 * Fixed duplicate characters (twins) after repeatedly logging in as the same character due to connection not being immediately closed during `NetHooks_NameCollision`. (@gohjoseph) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 6b7f3259..3830147f 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -1955,12 +1955,15 @@ namespace TShockAPI private static void Broadcast(CommandArgs args) { - string message = string.Join(" ", args.Parameters); + if (args.Parameters.Count > 0) + { + string message = string.Join(" ", args.Parameters); - TShock.Utils.Broadcast( - "(Server Broadcast) " + message, - Convert.ToByte(TShock.Config.Settings.BroadcastRGB[0]), Convert.ToByte(TShock.Config.Settings.BroadcastRGB[1]), - Convert.ToByte(TShock.Config.Settings.BroadcastRGB[2])); + TShock.Utils.Broadcast( + "(Server Broadcast) " + message, + Convert.ToByte(TShock.Config.Settings.BroadcastRGB[0]), Convert.ToByte(TShock.Config.Settings.BroadcastRGB[1]), + Convert.ToByte(TShock.Config.Settings.BroadcastRGB[2])); + } } private static void Off(CommandArgs args)