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

All greif related checks now respect ignoregreifdetection and ban/kick greif flags.

Browse source 
Refactored common ban/kick logic into helper method in tools.
Added ForceKick for when wanting to disallow players to join when sever is full or name is too long or not on whitelist etc.
Updated OnJoin to set e.Handled when players are force kicked during join.
Logging all players that successfully join the server.
This commit is contained in:
ricky 2011-06-07 14:36:59 +10:00
parent bdce73f0dc
commit 1ad261a562
3 changed files with 127 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

17
TShockAPI/Commands.cs
View file

@ -184,13 +184,10 @@ namespace TShockAPI
int player = Tools.FindPlayer(plStr);
if (!(player == -1 || player == -2 || plStr == ""))
{
if (!TShock.players[Tools.FindPlayer(plStr)].group.HasPermission("immunetokick"))
if (!Tools.Kick(player, "Misbehaviour."))
{
Tools.Kick(player, "You were kicked.");
Tools.Broadcast(Tools.FindPlayer(player) + " was kicked by " + Tools.FindPlayer(ply));
}
else
Tools.SendMessage(ply, "You can't kick another admin!", new[] {255f, 0f, 0f});
}
}
else if (Tools.FindPlayer(plStr) == -2)
Tools.SendMessage(ply, "More than one player matched!", new[] {255f, 0f, 0f});
@ -216,14 +213,10 @@ namespace TShockAPI
int player = Tools.FindPlayer(plStr);
if (!(player == -1 || player == -2 || plStr == ""))
{
if (!TShock.players[Tools.FindPlayer(plStr)].group.HasPermission("immunetoban"))
if (!Tools.Ban(player, banReason.Equals("") ? "Misbehaviour." : banReason, Tools.FindPlayer(adminplr)))
{
TShock.Bans.AddBan(Tools.GetPlayerIP(player), Main.player[player].name);
Tools.Kick(player, "You were banned.");
Tools.Broadcast(Tools.FindPlayer(adminplr) + " banned " + Tools.FindPlayer(player) + "!");
}
else
Tools.SendMessage(adminplr, "You can't ban another admin!", new[] {255f, 0f, 0f});
}
}
else if (Tools.FindPlayer(plStr) == -2)
Tools.SendMessage(adminplr, "More than one player matched!", new[] {255f, 0f, 0f});
@ -237,7 +230,7 @@ namespace TShockAPI
{
if (Main.player[player].active)
{
Tools.Kick(player, "Server shutting down!");
Tools.ForceKick(player, "Server shutting down!");
}
}
WorldGen.saveWorld();