Merge branch 'master' of github.com:TShock/TShock

This commit is contained in:
high 2011-06-06 20:19:58 -04:00
commit 3bbbafc94d
3 changed files with 11 additions and 6 deletions

View file

@ -843,8 +843,11 @@ namespace TShockAPI
public static void Ban(int plr, string reason = "")
{
Tools.Kick(plr, reason);
Bans.AddBan(Tools.GetPlayerIP(plr), Main.player[plr].name, reason);
if (!players[plr].group.HasPermission("immunetoban"))
{
Tools.Kick(plr,"Banned: " + reason);
Bans.AddBan(Tools.GetPlayerIP(plr), Main.player[plr].name, reason);
}
}
public class Position