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

Update SendMessage and SendMessageFromPlayer to use inbuilt Terraria chat messaging

Browse source
This commit is contained in:
Chris 2020-05-22 13:27:03 +09:30
parent d58a26d884
commit 83eb707761
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/TSPlayer.cs
View file

@ -1421,7 +1421,15 @@ namespace TShockAPI
}
return;
}
SendData(PacketTypes.SmartTextMessage, msg, 255, red, green, blue, -1);
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));
}
else
{
Terraria.Chat.ChatHelper.SendChatMessageToClient(NetworkText.FromFormattable(msg), new Color(red, green, blue), this.Index);
}
}
/// <summary>
@ -1443,7 +1451,7 @@ namespace TShockAPI
}
return;
}
SendDataFromPlayer(PacketTypes.SmartTextMessage, ply, msg, red, green, blue, -1);
Terraria.Chat.ChatHelper.BroadcastChatMessageAs((byte)ply, NetworkText.FromFormattable(msg), new Color(red, green, blue));
}
/// <summary>