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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
TShockAPI/ConfigurationManager.cs
View file

@ -17,7 +17,6 @@ namespace TShockAPI
public static bool infiniteInvasion; public static bool infiniteInvasion;
public static bool permaPvp; public static bool permaPvp;
public static int killCount; public static int killCount;
public static bool startedInvasion;
public static bool kickCheater = true; public static bool kickCheater = true;
public static bool banCheater = true; public static bool banCheater = true;
public static bool kickGriefer = true; public static bool kickGriefer = true;

7
TShockAPI/TShock.cs
View file

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

9
TShockAPI/Tools.cs
View file

@ -215,9 +215,12 @@ namespace TShockAPI
/// <param name="reason">string reason</param> /// <param name="reason">string reason</param>
public static void Kick(int ply, string reason) public static void Kick(int ply, string reason)
{ {
string displayName = FindPlayer(ply).Equals("") ? GetPlayerIP(ply) : FindPlayer(ply); if (!TShock.players[ply].group.HasPermission("immunetokick") || reason.Contains("Banned: "))
NetMessage.SendData(0x2, ply, -1, reason, 0x0, 0f, 0f, 0f); {
Log.Info("Kicked " + displayName + " for : " + reason); string displayName = FindPlayer(ply).Equals("") ? GetPlayerIP(ply) : FindPlayer(ply);
NetMessage.SendData(0x2, ply, -1, reason, 0x0, 0f, 0f, 0f);
Log.Info("Kicked " + displayName + " for : " + reason);
}
} }
/// <summary> /// <summary>