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

Griefing != Cheating

Browse source
This commit is contained in:
Maverick Motherfucker 2011-06-02 22:24:43 -07:00
parent 818348a445
commit f5a76dd154
3 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/ConfigFile.cs
View file

@ -15,8 +15,10 @@ namespace TShockAPI
public bool EnableWhitelist = false; public bool EnableWhitelist = false;
public bool InfiniteInvasion = false; public bool InfiniteInvasion = false;
public bool AlwaysPvP = false; public bool AlwaysPvP = false;
public bool KickSaveEditors = true; public bool KickCheaters = true;
public bool BanSaveEditors = true; public bool BanCheaters = true;
public bool KickGriefers = true;
public bool BanGriefers = true;
public bool BanKillTileAbusers = false; public bool BanKillTileAbusers = false;
public bool KickKillTileAbusers = false; public bool KickKillTileAbusers = false;
} }

14
TShockAPI/ConfigurationManager.cs
View file

@ -23,6 +23,8 @@ namespace TShockAPI
public static bool startedInvasion = false; public static bool startedInvasion = false;
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 banGriefer = true;
public static bool banTnt = false; public static bool banTnt = false;
public static bool kickTnt = false; public static bool kickTnt = false;
public enum NPCList : int public enum NPCList : int
@ -45,8 +47,10 @@ namespace TShockAPI
enableWhitelist = cfg.EnableWhitelist; enableWhitelist = cfg.EnableWhitelist;
infiniteInvasion = cfg.InfiniteInvasion; infiniteInvasion = cfg.InfiniteInvasion;
permaPvp = cfg.AlwaysPvP; permaPvp = cfg.AlwaysPvP;
kickCheater = cfg.KickSaveEditors; kickCheater = cfg.KickCheaters;
banCheater = cfg.BanSaveEditors; banCheater = cfg.BanCheaters;
kickGriefer = cfg.KickGriefers;
banGriefer = cfg.BanGriefers;
banTnt = cfg.BanKillTileAbusers; banTnt = cfg.BanKillTileAbusers;
kickTnt = cfg.KickKillTileAbusers; kickTnt = cfg.KickKillTileAbusers;
} }
@ -70,8 +74,10 @@ namespace TShockAPI
cfg.EnableWhitelist = false; cfg.EnableWhitelist = false;
cfg.InfiniteInvasion = false; cfg.InfiniteInvasion = false;
cfg.AlwaysPvP = false; cfg.AlwaysPvP = false;
cfg.KickSaveEditors = false; cfg.KickCheaters = kickCheater;
cfg.BanSaveEditors = false; cfg.BanCheaters = banCheater;
cfg.KickGriefers = kickGriefer;
cfg.BanGriefers = banGriefer;
cfg.BanKillTileAbusers = true; cfg.BanKillTileAbusers = true;
cfg.KickKillTileAbusers = true; cfg.KickKillTileAbusers = true;

23
TShockAPI/Tools.cs
View file

@ -219,7 +219,7 @@ namespace TShockAPI
} }
/// <summary> /// <summary>
/// Determines what to do with someone listed in cheaters.txt /// Adds someone to cheaters.txt
/// </summary> /// </summary>
/// <param name="ply">int player</param> /// <param name="ply">int player</param>
public static void HandleCheater(int ply) public static void HandleCheater(int ply)
@ -229,7 +229,6 @@ namespace TShockAPI
string cheater = Tools.FindPlayer(ply); string cheater = Tools.FindPlayer(ply);
string ip = Tools.GetRealIP(Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint)); string ip = Tools.GetRealIP(Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint));
FileTools.WriteGrief(ply);
FileTools.WriteCheater(ply); FileTools.WriteCheater(ply);
if (!ConfigurationManager.kickCheater) { return; } if (!ConfigurationManager.kickCheater) { return; }
Netplay.serverSock[ply].kill = true; Netplay.serverSock[ply].kill = true;
@ -238,6 +237,26 @@ namespace TShockAPI
Tools.Broadcast(cheater + " was " + (ConfigurationManager.banCheater ? "banned " : "kicked ") + "for cheating."); Tools.Broadcast(cheater + " was " + (ConfigurationManager.banCheater ? "banned " : "kicked ") + "for cheating.");
} }
} }
/// <summary>
/// Adds someone to greifers.txt
/// </summary>
/// <param name="ply">int player</param>
public static void HandleGreifer(int ply)
{
if (!TShock.players[ply].IsAdmin())
{
string cheater = Tools.FindPlayer(ply);
string ip = Tools.GetRealIP(Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint));
FileTools.WriteGrief(ply);
if (!ConfigurationManager.kickGriefer) { return; }
Netplay.serverSock[ply].kill = true;
Netplay.serverSock[ply].Reset();
NetMessage.syncPlayers();
Tools.Broadcast(cheater + " was " + (ConfigurationManager.banCheater ? "banned " : "kicked ") + "for greifing.");
}
}
/// <summary> /// <summary>
/// Shows a MOTD to the player /// Shows a MOTD to the player
/// </summary> /// </summary>