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

Merge pull request #469 from Scavenger3/SilentJoin

Browse source 
Added SilentJoin to TSPlayer
This commit is contained in:
Zack 2013-01-14 04:28:12 -08:00
commit 12c44cc4bb
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/GetDataHandlers.cs
View file

@ -1444,12 +1444,14 @@ namespace TShockAPI
Log.Info(string.Format("{0} ({1}) from '{2}' group from '{3}' joined. ({4}/{5})", args.Player.Name, args.Player.IP, Log.Info(string.Format("{0} ({1}) from '{2}' group from '{3}' joined. ({4}/{5})", args.Player.Name, args.Player.IP,
args.Player.Group.Name, args.Player.Country, TShock.Utils.ActivePlayers(), args.Player.Group.Name, args.Player.Country, TShock.Utils.ActivePlayers(),
TShock.Config.MaxSlots)); TShock.Config.MaxSlots));
if (!args.Player.SilentJoinInProgress)
TShock.Utils.Broadcast(string.Format("{0} ({1}) has joined.", args.Player.Name, args.Player.Country), Color.Yellow); TShock.Utils.Broadcast(string.Format("{0} ({1}) has joined.", args.Player.Name, args.Player.Country), Color.Yellow);
} }
else else
{ {
Log.Info(string.Format("{0} ({1}) from '{2}' group joined. ({3}/{4})", args.Player.Name, args.Player.IP, Log.Info(string.Format("{0} ({1}) from '{2}' group joined. ({3}/{4})", args.Player.Name, args.Player.IP,
args.Player.Group.Name, TShock.Utils.ActivePlayers(), TShock.Config.MaxSlots)); args.Player.Group.Name, TShock.Utils.ActivePlayers(), TShock.Config.MaxSlots));
if (!args.Player.SilentJoinInProgress)
TShock.Utils.Broadcast(args.Player.Name + " has joined.", Color.Yellow); TShock.Utils.Broadcast(args.Player.Name + " has joined.", Color.Yellow);
} }

2
TShockAPI/TSPlayer.cs
View file

@ -231,6 +231,8 @@ namespace TShockAPI
public bool SilentKickInProgress; public bool SilentKickInProgress;
public bool SilentJoinInProgress;
/// <summary> /// <summary>
/// A list of points where ice tiles have been placed. /// A list of points where ice tiles have been placed.
/// </summary> /// </summary>