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

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

Browse source 
Conflicts:
	TShockAPI/ConfigFile.cs
This commit is contained in:
Zidonuke 2011-12-22 23:50:31 -05:00
commit 06bcf00013
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/ConfigFile.cs
View file

@ -183,8 +183,8 @@ namespace TShockAPI
[Description("Disables snow ball projectiles from spawning")] //Change this to stop the tile from spawning
public bool DisableSnowBalls = false;
[Description("Change ingame chat format, {0} = Group Prefix, {1} = Player Name, {2} = Group Suffix, {3} = Chat Message")]
public string ChatFormat = "{0}{1}{2}: {3}";
[Description("Change ingame chat format, {0} = Group Name, {1} = Group Prefix, {2} = Player Name, {3} = Group Suffix, {4} = Chat Message")]
public string ChatFormat = "{1}{2}{3}: {4}";
public static ConfigFile Read(string path)
{

2
TShockAPI/TShock.cs
View file

@ -560,7 +560,7 @@ namespace TShockAPI
}
else
{
TShock.Utils.Broadcast(String.Format(TShock.Config.ChatFormat, tsplr.Group.Prefix, tsplr.Name, tsplr.Group.Suffix, text), tsplr.Group.R, tsplr.Group.G, tsplr.Group.B);
TShock.Utils.Broadcast(String.Format(TShock.Config.ChatFormat, tsplr.Group.Name, tsplr.Group.Prefix, tsplr.Name, tsplr.Group.Suffix, text), tsplr.Group.R, tsplr.Group.G, tsplr.Group.B);
e.Handled = true;
}
}