themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge remote-tracking branch 'packmandude/general-devel' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2022-10-14 23:19:40 -07:00
commit da6a134609
No known key found for this signature in database
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -52,6 +52,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Removed the config options `TileRectangleSizeThreshold` and `KickOnTileRectangleSizeThresholdBroken` because they are made obsolete by the new system, which will only allow valid rectangle sizes (at a maximum of only 4 by 4 tiles in 1.4.3.6). (@punchready) * Removed the config options `TileRectangleSizeThreshold` and `KickOnTileRectangleSizeThresholdBroken` because they are made obsolete by the new system, which will only allow valid rectangle sizes (at a maximum of only 4 by 4 tiles in 1.4.3.6). (@punchready)
* Bumped Newtonsoft Json to 13.0.1. (@dependabot) * Bumped Newtonsoft Json to 13.0.1. (@dependabot)
* Allow the Cool Whip to apply `CoolWhipNPCDebuff` for `240` ticks, fixing abnormal NPC buff add rejects in Bouncer. (@drunderscore) * Allow the Cool Whip to apply `CoolWhipNPCDebuff` for `240` ticks, fixing abnormal NPC buff add rejects in Bouncer. (@drunderscore)
* Prevent Server Broadcast to display prefix without a message. (@PackmanDude, @punchready)
## TShock 4.5.17 ## 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`. (@PotatoCider) * Fixed duplicate characters (twins) after repeatedly logging in as the same character due to connection not being immediately closed during `NetHooks_NameCollision`. (@PotatoCider)

13
TShockAPI/Commands.cs
View file

@ -1954,12 +1954,15 @@ namespace TShockAPI
private static void Broadcast(CommandArgs args) 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( TShock.Utils.Broadcast(
"(Server Broadcast) " + message, "(Server Broadcast) " + message,
Convert.ToByte(TShock.Config.Settings.BroadcastRGB[0]), Convert.ToByte(TShock.Config.Settings.BroadcastRGB[1]), Convert.ToByte(TShock.Config.Settings.BroadcastRGB[0]), Convert.ToByte(TShock.Config.Settings.BroadcastRGB[1]),
Convert.ToByte(TShock.Config.Settings.BroadcastRGB[2])); Convert.ToByte(TShock.Config.Settings.BroadcastRGB[2]));
}
} }
private static void Off(CommandArgs args) private static void Off(CommandArgs args)