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

Fix Chat over head.

Browse source 
Copy pasta fix in /group (CS #Regions)
This commit is contained in:
Zack Piispanen 2013-10-11 00:16:19 -04:00
parent 1acbb21125
commit acdaa2eb05
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
View file

@ -2299,7 +2299,7 @@ namespace TShockAPI
#endregion
return;
case "prefix":
#region Suffix
#region Prefix
{
if (args.Parameters.Count < 2)
{
@ -2344,7 +2344,7 @@ namespace TShockAPI
#endregion
return;
case "color":
#region Suffix
#region Color
{
if (args.Parameters.Count < 2 || args.Parameters.Count > 3)
{

14
TShockAPI/TShock.cs
View file

@ -983,12 +983,16 @@ namespace TShockAPI
}
else
{
string name = Main.player[args.Who].name;
Main.player[args.Who].name = String.Format(Config.ChatAboveHeadsFormat, tsplr.Group.Name, tsplr.Group.Prefix, tsplr.Name, tsplr.Group.Suffix);
NetMessage.SendData((int)PacketTypes.PlayerInfo, -1, -1, Main.player[args.Who].name, args.Who, 0, 0, 0, 0);
Main.player[args.Who].name = name;
Utils.Broadcast(args.Who, args.Text, tsplr.Group.R, tsplr.Group.G, tsplr.Group.B);
Player ply = Main.player[args.Who];
string name = ply.name;
ply.name = String.Format(Config.ChatAboveHeadsFormat, tsplr.Group.Name, tsplr.Group.Prefix, tsplr.Name, tsplr.Group.Suffix);
NetMessage.SendData((int)PacketTypes.PlayerInfo, -1, -1, ply.name, args.Who, 0, 0, 0, 0);
ply.name = name;
NetMessage.SendData((int) PacketTypes.ChatText, -1, args.Who, args.Text, args.Who, tsplr.Group.R, tsplr.Group.G, tsplr.Group.B);
NetMessage.SendData((int)PacketTypes.PlayerInfo, -1, -1, name, args.Who, 0, 0, 0, 0);
tsplr.SendMessage(String.Format("<{0}> {1}",
String.Format(Config.ChatAboveHeadsFormat, tsplr.Group.Name, tsplr.Group.Prefix, tsplr.Name, tsplr.Group.Suffix),
args.Text), tsplr.Group.R, tsplr.Group.G, tsplr.Group.B);
args.Handled = true;
}
}