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

Merge branch 'general-devel' of github.com:Pryaxis/TShock into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2020-05-22 21:06:48 -07:00
commit 41f35a27df
No known key found for this signature in database
GPG key ID: A07BD9023D1664DB
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/TSPlayer.cs
View file

@ -1424,11 +1424,11 @@ namespace TShockAPI
if (this.Index == -1) //-1 is our broadcast index - this implies we're using TSPlayer.All.SendMessage and broadcasting to all clients if (this.Index == -1) //-1 is our broadcast index - this implies we're using TSPlayer.All.SendMessage and broadcasting to all clients
{ {
Terraria.Chat.ChatHelper.BroadcastChatMessage(NetworkText.FromFormattable(msg), new Color(red, green, blue)); Terraria.Chat.ChatHelper.BroadcastChatMessage(NetworkText.FromLiteral(msg), new Color(red, green, blue));
} }
else else
{ {
Terraria.Chat.ChatHelper.SendChatMessageToClient(NetworkText.FromFormattable(msg), new Color(red, green, blue), this.Index); Terraria.Chat.ChatHelper.SendChatMessageToClient(NetworkText.FromLiteral(msg), new Color(red, green, blue), this.Index);
} }
} }
@ -1451,7 +1451,7 @@ namespace TShockAPI
} }
return; return;
} }
Terraria.Chat.ChatHelper.BroadcastChatMessageAs((byte)ply, NetworkText.FromFormattable(msg), new Color(red, green, blue)); Terraria.Chat.ChatHelper.BroadcastChatMessageAs((byte)ply, NetworkText.FromLiteral(msg), new Color(red, green, blue));
} }
/// <summary> /// <summary>