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

Name length check now works.

Browse source 
Bans now run by name too.
Closes #36
This commit is contained in:
Shank 2011-06-07 00:08:32 -06:00
parent 3589886eab
commit b7a87866fe
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TShockAPI/TShock.cs
View file

@ -201,6 +201,15 @@ namespace TShockAPI
{ {
if (e.MsgID == 4) if (e.MsgID == 4)
{ {
var ban = Bans.GetBanByName(Main.player[e.Msg.whoAmI].name);
if (ban != null)
{
Tools.Kick(e.Msg.whoAmI, "You are banned: " + ban.Reason);
}
if (Main.player[e.Msg.whoAmI].name.Length > 32)
{
Tools.Kick(e.Msg.whoAmI, "Name exceeded 32 characters.");
}
if (players[e.Msg.whoAmI] == null) if (players[e.Msg.whoAmI] == null)
{ {
Tools.Kick(e.Msg.whoAmI, "Player doesn't exist"); Tools.Kick(e.Msg.whoAmI, "Player doesn't exist");
@ -612,11 +621,6 @@ namespace TShockAPI
{ {
Tools.Kick(ply, "You are banned: " + ban.Reason); Tools.Kick(ply, "You are banned: " + ban.Reason);
} }
else if (Tools.FindPlayer(ply).Length > 32)
{
Tools.Kick(ply, "Your name was too long.");
Tools.Broadcast(ip + " was kicked because their name exceeded 32 characters.");
}
if (!FileTools.OnWhitelist(ip)) if (!FileTools.OnWhitelist(ip))
{ {
Tools.Kick(ply, "Not on whitelist."); Tools.Kick(ply, "Not on whitelist.");