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

Change various things

Browse source 
Show "player has joined." only when they are being greeted, send
info/success messages in pagination tools if the target is not a real
player, and change the "player left" message to "player has left."
This commit is contained in:
MarioE 2013-11-30 09:58:50 -05:00
parent 652425c4ba
commit 968b326798
3 changed files with 26 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TShockAPI/GetDataHandlers.cs
View file

@ -1588,26 +1588,6 @@ namespace TShockAPI
} }
NetMessage.SendData((int) PacketTypes.TimeSet, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY); NetMessage.SendData((int) PacketTypes.TimeSet, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
if (TShock.Config.EnableGeoIP && TShock.Geo != null)
{
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(),
TShock.Config.MaxSlots));
if (!args.Player.SilentJoinInProgress)
TShock.Utils.Broadcast(string.Format("{0} ({1}) has joined.", args.Player.Name, args.Player.Country), Color.Yellow);
}
else
{
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));
if (!args.Player.SilentJoinInProgress)
TShock.Utils.Broadcast(args.Player.Name + " has joined.", Color.Yellow);
}
if (TShock.Config.DisplayIPToAdmins)
TShock.Utils.SendLogs(string.Format("{0} has joined. IP: {1}", args.Player.Name, args.Player.IP), Color.Blue);
return false; return false;
} }

30
TShockAPI/PaginationTools.cs
View file

@ -125,14 +125,10 @@ namespace TShockAPI
{ {
if (settings.NothingToDisplayString != null) if (settings.NothingToDisplayString != null)
{ {
if (player is TSServerPlayer) if (!player.RealPlayer)
{
player.SendSuccessMessage(settings.NothingToDisplayString); player.SendSuccessMessage(settings.NothingToDisplayString);
}
else else
{
player.SendMessage(settings.NothingToDisplayString, settings.HeaderTextColor); player.SendMessage(settings.NothingToDisplayString, settings.HeaderTextColor);
}
} }
return; return;
} }
@ -145,14 +141,10 @@ namespace TShockAPI
if (settings.IncludeHeader) if (settings.IncludeHeader)
{ {
if (player is TSServerPlayer) if (!player.RealPlayer)
{
player.SendSuccessMessage(string.Format(settings.HeaderFormat, pageNumber, pageCount)); player.SendSuccessMessage(string.Format(settings.HeaderFormat, pageNumber, pageCount));
}
else else
{
player.SendMessage(string.Format(settings.HeaderFormat, pageNumber, pageCount), settings.HeaderTextColor); player.SendMessage(string.Format(settings.HeaderFormat, pageNumber, pageCount), settings.HeaderTextColor);
}
} }
int listOffset = (pageNumber - 1) * settings.MaxLinesPerPage; int listOffset = (pageNumber - 1) * settings.MaxLinesPerPage;
@ -199,14 +191,10 @@ namespace TShockAPI
if (lineMessage != null) if (lineMessage != null)
{ {
if (player is TSServerPlayer) if (!player.RealPlayer)
{
player.SendInfoMessage(lineMessage); player.SendInfoMessage(lineMessage);
}
else else
{
player.SendMessage(lineMessage, lineColor); player.SendMessage(lineMessage, lineColor);
}
} }
} }
@ -214,26 +202,18 @@ namespace TShockAPI
{ {
if (settings.NothingToDisplayString != null) if (settings.NothingToDisplayString != null)
{ {
if (player is TSServerPlayer) if (!player.RealPlayer)
{
player.SendSuccessMessage(settings.NothingToDisplayString); player.SendSuccessMessage(settings.NothingToDisplayString);
}
else else
{
player.SendMessage(settings.NothingToDisplayString, settings.HeaderTextColor); player.SendMessage(settings.NothingToDisplayString, settings.HeaderTextColor);
}
} }
} }
else if (settings.IncludeFooter && pageNumber + 1 <= pageCount) else if (settings.IncludeFooter && pageNumber + 1 <= pageCount)
{ {
if (player is TSServerPlayer) if (!player.RealPlayer)
{
player.SendInfoMessage(string.Format(settings.FooterFormat, pageNumber + 1, pageNumber, pageCount)); player.SendInfoMessage(string.Format(settings.FooterFormat, pageNumber + 1, pageNumber, pageCount));
}
else else
{
player.SendMessage(string.Format(settings.FooterFormat, pageNumber + 1, pageNumber, pageCount), settings.FooterTextColor); player.SendMessage(string.Format(settings.FooterFormat, pageNumber + 1, pageNumber, pageCount), settings.FooterTextColor);
}
} }
} }

25
TShockAPI/TShock.cs
View file

@ -993,9 +993,7 @@ namespace TShockAPI
if (tsplr != null && tsplr.ReceivedInfo) if (tsplr != null && tsplr.ReceivedInfo)
{ {
if (!tsplr.SilentKickInProgress && tsplr.State >= 3) if (!tsplr.SilentKickInProgress && tsplr.State >= 3)
{ Utils.Broadcast(tsplr.Name + " has left.", Color.Yellow);
Utils.Broadcast(tsplr.Name + " left", Color.Yellow);
}
Log.Info(string.Format("{0} disconnected.", tsplr.Name)); Log.Info(string.Format("{0} disconnected.", tsplr.Name));
if (tsplr.IsLoggedIn && !tsplr.IgnoreActionsForClearingTrashCan && TShock.Config.ServerSideCharacter && (!tsplr.Dead || tsplr.TPlayer.difficulty != 2)) if (tsplr.IsLoggedIn && !tsplr.IgnoreActionsForClearingTrashCan && TShock.Config.ServerSideCharacter && (!tsplr.Dead || tsplr.TPlayer.difficulty != 2))
@ -1004,7 +1002,7 @@ namespace TShockAPI
CharacterDB.InsertPlayerData(tsplr); CharacterDB.InsertPlayerData(tsplr);
} }
if ((Config.RememberLeavePos) &&(!tsplr.LoginHarassed)) if (Config.RememberLeavePos && !tsplr.LoginHarassed)
{ {
RememberedPos.InsertLeavePos(tsplr.Name, tsplr.IP, (int) (tsplr.X/16), (int) (tsplr.Y/16)); RememberedPos.InsertLeavePos(tsplr.Name, tsplr.IP, (int) (tsplr.X/16), (int) (tsplr.Y/16));
} }
@ -1186,6 +1184,25 @@ namespace TShockAPI
player.LoginMS = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.LoginMS = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
if (TShock.Config.EnableGeoIP && TShock.Geo != null)
{
Log.Info(string.Format("{0} ({1}) from '{2}' group from '{3}' joined. ({4}/{5})", player.Name, player.IP,
player.Group.Name, player.Country, TShock.Utils.ActivePlayers(),
TShock.Config.MaxSlots));
if (!player.SilentJoinInProgress)
TShock.Utils.Broadcast(string.Format("{0} ({1}) has joined.", player.Name, player.Country), Color.Yellow);
}
else
{
Log.Info(string.Format("{0} ({1}) from '{2}' group joined. ({3}/{4})", player.Name, player.IP,
player.Group.Name, TShock.Utils.ActivePlayers(), TShock.Config.MaxSlots));
if (!player.SilentJoinInProgress)
TShock.Utils.Broadcast(player.Name + " has joined.", Color.Yellow);
}
if (TShock.Config.DisplayIPToAdmins)
TShock.Utils.SendLogs(string.Format("{0} has joined. IP: {1}", player.Name, player.IP), Color.Blue);
Utils.ShowFileToUser(player, "motd.txt"); Utils.ShowFileToUser(player, "motd.txt");
string pvpMode = Config.PvPMode.ToLowerInvariant(); string pvpMode = Config.PvPMode.ToLowerInvariant();