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

Merge pull request #43 from rjhazelwood/master

Browse source 
Grief checks now honor ignore greif permission and two grief flags.
This commit is contained in:
Ricky Hazelwood 2011-06-07 13:55:26 -07:00
commit 0fdfe8a09f
3 changed files with 178 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

82
TShockAPI/Commands.cs Normal file → Executable file
View file

@ -183,23 +183,38 @@ namespace TShockAPI
public static void Kick(CommandArgs args) public static void Kick(CommandArgs args)
{ {
string plStr = args.Message.Remove(0, 5).Trim().TrimEnd('"').TrimStart('"'); string input = args.Message.Remove(0, 5).Trim();
int ply = args.PlayerID; string plStr = "";
int player = Tools.FindPlayer(plStr); string reason = "";
if (!(player == -1 || player == -2 || plStr == "")) int splitIndex = input.StartsWith("\"") ? splitIndex = input.IndexOf('"', 1) : splitIndex = input.IndexOf(' ', 0);
if (splitIndex == -1)
{ {
if (!TShock.players[Tools.FindPlayer(plStr)].group.HasPermission("immunetokick")) plStr = input;
{
Tools.Kick(player, "You were kicked.");
Tools.Broadcast(Tools.FindPlayer(player) + " was kicked by " + Tools.FindPlayer(ply));
} }
else else
Tools.SendMessage(ply, "You can't kick another admin!", new[] { 255f, 0f, 0f }); {
plStr = input.Substring(0, splitIndex).Trim().TrimEnd('"').TrimStart('"');
reason = input.Substring(splitIndex + 1).Trim().TrimEnd('"').TrimStart('"');
} }
else if (Tools.FindPlayer(plStr) == -2) int ply = args.PlayerID;
if (plStr.Length != 0)
{
int player = Tools.FindPlayer(plStr);
if (player == -1)
Tools.SendMessage(ply, "Invalid player!", new[] { 255f, 0f, 0f });
else if (player == -2)
Tools.SendMessage(ply, "More than one player matched!", new[] { 255f, 0f, 0f }); Tools.SendMessage(ply, "More than one player matched!", new[] { 255f, 0f, 0f });
else else
Tools.SendMessage(ply, "Invalid player!", new[] { 255f, 0f, 0f }); {
if (!Tools.Kick(player, reason.Length != 0 ? reason : "Misbehaviour."))
{
Tools.SendMessage(ply, "You can't kick another admin!", new[] { 255f, 0f, 0f });
}
}
}
else
Tools.SendMessage(ply, "Invalid syntax! Proper syntax: /kick <player> [reason]",
new[] { 255f, 0f, 0f });
} }
public static void BanIP(CommandArgs args) public static void BanIP(CommandArgs args)
@ -226,35 +241,38 @@ namespace TShockAPI
public static void Ban(CommandArgs args) public static void Ban(CommandArgs args)
{ {
string plStr = args.Message.Remove(0, 4).Trim().TrimEnd('"').TrimStart('"').Split(' ')[0]; string input = args.Message.Remove(0, 4).Trim();
string[] reason = plStr.Split(' '); string plStr = "";
string banReason = ""; string reason = "";
for (int i = 0; i < reason.Length; i++) int splitIndex = input.StartsWith("\"") ? splitIndex = input.IndexOf('"', 1) : splitIndex = input.IndexOf(' ', 0);
if (splitIndex == -1)
{ {
if (reason[i].Contains("\"")) plStr = input;
reason[i] = "";
} }
for (int i = 0; i < reason.Length; i++) else
{ {
banReason += reason[i]; plStr = input.Substring(0, splitIndex).Trim().TrimEnd('"').TrimStart('"');
reason = input.Substring(splitIndex + 1).Trim().TrimEnd('"').TrimStart('"');
} }
int adminplr = args.PlayerID; int ply = args.PlayerID;
if (plStr.Length != 0)
{
int player = Tools.FindPlayer(plStr); int player = Tools.FindPlayer(plStr);
if (!(player == -1 || player == -2 || plStr == "")) if (player == -1)
Tools.SendMessage(ply, "Invalid player!", new[] { 255f, 0f, 0f });
else if (player == -2)
Tools.SendMessage(ply, "More than one player matched!", new[] { 255f, 0f, 0f });
else
{ {
if (!TShock.players[Tools.FindPlayer(plStr)].group.HasPermission("immunetoban")) if (!Tools.Ban(player, reason.Length != 0 ? reason : "Misbehaviour."))
{ {
TShock.Bans.AddBan(Tools.GetPlayerIP(player), Main.player[player].name); Tools.SendMessage(ply, "You can't ban another admin!", new[] { 255f, 0f, 0f });
Tools.Kick(player, "You were banned."); }
Tools.Broadcast(Tools.FindPlayer(adminplr) + " banned " + Tools.FindPlayer(player) + " with reason " + reason + "!"); }
} }
else else
Tools.SendMessage(adminplr, "You can't ban another admin!", new[] { 255f, 0f, 0f }); Tools.SendMessage(ply, "Invalid syntax! Proper syntax: /ban <player> [reason]",
} new[] { 255f, 0f, 0f });
else if (Tools.FindPlayer(plStr) == -2)
Tools.SendMessage(adminplr, "More than one player matched!", new[] { 255f, 0f, 0f });
else
Tools.SendMessage(adminplr, "Invalid player!", new[] { 255f, 0f, 0f });
} }
public static void UnBan(CommandArgs args) public static void UnBan(CommandArgs args)
@ -295,7 +313,7 @@ namespace TShockAPI
{ {
if (Main.player[player].active) if (Main.player[player].active)
{ {
Tools.Kick(player, "Server shutting down!"); Tools.ForceKick(player, "Server shutting down!");
} }
} }
WorldGen.saveWorld(); WorldGen.saveWorld();

140
TShockAPI/TShock.cs Normal file → Executable file
View file

@ -213,24 +213,23 @@ namespace TShockAPI
var ban = Bans.GetBanByName(Main.player[e.Msg.whoAmI].name); var ban = Bans.GetBanByName(Main.player[e.Msg.whoAmI].name);
if (ban != null) if (ban != null)
{ {
Tools.Kick(e.Msg.whoAmI, "You are banned: " + ban.Reason); Tools.ForceKick(e.Msg.whoAmI, "You are banned: " + ban.Reason);
return true; return true;
} }
string name = Encoding.ASCII.GetString(e.Msg.readBuffer, e.Index + 23, (e.Length - (e.Index + 23)) + e.Index - 1); string name = Encoding.ASCII.GetString(e.Msg.readBuffer, e.Index + 23, (e.Length - (e.Index + 23)) + e.Index - 1);
if (name.Length > 32) if (name.Length > 32)
{ {
Tools.Kick(e.Msg.whoAmI, "Name exceeded 32 characters."); Tools.ForceKick(e.Msg.whoAmI, "Name exceeded 32 characters.");
return true; return true;
} }
if (players[e.Msg.whoAmI] == null) if (players[e.Msg.whoAmI] == null)
{ {
Tools.Kick(e.Msg.whoAmI, "Player doesn't exist"); Tools.ForceKick(e.Msg.whoAmI, "Player doesn't exist");
return true; return true;
} }
else if (players[e.Msg.whoAmI].receivedInfo) else if (players[e.Msg.whoAmI].receivedInfo)
{ {
Tools.Kick(e.Msg.whoAmI, "Sent client info more than once"); return Tools.HandleGriefer(e.Msg.whoAmI, "Sent client info more than once");
return true;
} }
else else
{ {
@ -250,8 +249,7 @@ namespace TShockAPI
int tileY = Math.Abs(y); int tileY = Math.Abs(y);
if (size > 5 || Math.Abs(plyX - tileX) > 10 || Math.Abs(plyY - tileY) > 10) if (size > 5 || Math.Abs(plyX - tileX) > 10 || Math.Abs(plyY - tileY) > 10)
{ {
Ban(e.Msg.whoAmI, "Send Tile Square Abuse"); return Tools.HandleGriefer(e.Msg.whoAmI, "Send Tile Square Abuse");
return true;
} }
} }
} }
@ -272,10 +270,7 @@ namespace TShockAPI
if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6)) if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6))
{ {
TShock.Ban(e.Msg.whoAmI, "Placing impossible to place blocks."); return Tools.HandleGriefer(e.Msg.whoAmI, "Placing impossible to place blocks.");
Tools.Broadcast(Main.player[e.Msg.whoAmI].name +
" was banned for placing impossible to place blocks.");
return true;
} }
} }
if (type == 0 || type == 1) if (type == 0 || type == 1)
@ -320,25 +315,18 @@ namespace TShockAPI
} }
else if (e.MsgID == 0x0A) //SendSection else if (e.MsgID == 0x0A) //SendSection
{ {
Tools.Broadcast(string.Format("{0}({1}) attempted sending a section", Main.player[e.Msg.whoAmI].name, return Tools.HandleGriefer(e.Msg.whoAmI, "SendSection abuse.");
e.Msg.whoAmI));
Tools.Kick(e.Msg.whoAmI, "SendSection abuse.");
return true;
} }
else if (e.MsgID == 0x17) //Npc Data else if (e.MsgID == 0x17) //Npc Data
{ {
Tools.Broadcast(string.Format("{0}({1}) attempted spawning an NPC", Main.player[e.Msg.whoAmI].name, return Tools.HandleGriefer(e.Msg.whoAmI, "Spawn NPC abuse");
e.Msg.whoAmI));
Tools.Kick(e.Msg.whoAmI, "Spawn NPC abuse");
return true;
} }
else if (e.MsgID == 0x0D) //Update Player else if (e.MsgID == 0x0D) //Update Player
{ {
byte plr = e.Msg.readBuffer[e.Index]; byte plr = e.Msg.readBuffer[e.Index];
if (plr != e.Msg.whoAmI) if (plr != e.Msg.whoAmI)
{ {
Tools.Kick(e.Msg.whoAmI, "Update Player abuse"); return Tools.HandleGriefer(e.Msg.whoAmI, "Update Player abuse");
return true;
} }
} }
else if (e.MsgID == 0x10) else if (e.MsgID == 0x10)
@ -353,19 +341,7 @@ namespace TShockAPI
{ {
if (players[ply].syncHP) if (players[ply].syncHP)
{ {
if (!players[ply].group.HasPermission("ignorecheatdetection")) return Tools.HandleCheater(ply, "Abnormal life increase");
{
if (ConfigurationManager.banCheater || ConfigurationManager.kickCheater)
{
string playerName = Tools.FindPlayer(ply);
if (ConfigurationManager.banCheater)
Ban(ply, "Abnormal life increase");
Tools.Kick(ply, "Abnormal life increase");
Tools.Broadcast(playerName + " was " + (ConfigurationManager.banCheater ? "banned" : "kicked") +
" because they gained an abnormal amount of health.");
return true;
}
}
} }
else else
{ {
@ -386,19 +362,7 @@ namespace TShockAPI
{ {
if (players[ply].syncMP) if (players[ply].syncMP)
{ {
if (!players[ply].group.HasPermission("ignorecheatdetection")) return Tools.HandleCheater(ply, "Abnormal mana increase");
{
if (ConfigurationManager.banCheater || ConfigurationManager.kickCheater)
{
string playerName = Tools.FindPlayer(ply);
if (ConfigurationManager.banCheater)
Ban(ply, "Abnormal mana increase");
Tools.Kick(ply, "Abnormal mana increase");
Tools.Broadcast(playerName + " was " + (ConfigurationManager.banCheater ? "banned" : "kicked") +
" because they gained an abnormal amount of mana.");
return true;
}
}
} }
else else
{ {
@ -423,20 +387,7 @@ namespace TShockAPI
if (type == 29 || type == 28 || type == 30) if (type == 29 || type == 28 || type == 30)
{ {
if (!players[e.Msg.whoAmI].group.HasPermission("ignoregriefdetection")) return Tools.HandleExplosivesUser(e.Msg.whoAmI, "Throwing an explosive device.");
{
if (ConfigurationManager.kickBoom || ConfigurationManager.banBoom)
{
int i = e.Msg.whoAmI;
if (ConfigurationManager.banBoom)
Ban(i, "Explosives");
Tools.Kick(i, "Explosives were thrown.");
Tools.Broadcast(Main.player[i].name + " was " +
(ConfigurationManager.banBoom ? "banned" : "kicked") +
" for throwing an explosive device.");
return true;
}
}
} }
} }
} }
@ -451,10 +402,7 @@ namespace TShockAPI
if (id != e.Msg.whoAmI) if (id != e.Msg.whoAmI)
{ {
Ban(e.Msg.whoAmI, "Griefer"); return Tools.HandleGriefer(e.Msg.whoAmI, "Trying to execute KillMe on someone else.");
Log.Info(Tools.FindPlayer(e.Msg.whoAmI) +
" was kicked for trying to execute KillMe on someone else.");
return true;
} }
} }
} }
@ -502,20 +450,15 @@ namespace TShockAPI
if (lava && lavacount <= 0) if (lava && lavacount <= 0)
{ {
TShock.Ban(e.Msg.whoAmI, "Placing lava they didn't have."); return Tools.HandleGriefer(e.Msg.whoAmI, "Placing lava they didn't have."); ;
return true;
} }
else if (!lava && watercount <= 0) else if (!lava && watercount <= 0)
{ {
TShock.Ban(e.Msg.whoAmI, "Placing water they didn't have."); return Tools.HandleGriefer(e.Msg.whoAmI, "Placing water they didn't have.");
return true;
} }
if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6)) if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6))
{ {
TShock.Ban(e.Msg.whoAmI, "Placing impossible to place liquid."); return Tools.HandleGriefer(e.Msg.whoAmI, "Placing impossible to place liquid."); ;
Tools.Broadcast(Main.player[e.Msg.whoAmI].name +
" was banned for placing impossible to place liquid.");
return true;
} }
if (ConfigurationManager.spawnProtect) if (ConfigurationManager.spawnProtect)
@ -547,17 +490,11 @@ namespace TShockAPI
return; return;
} }
int plr = who; //legacy support int plr = who; //legacy support
Log.Info(Tools.FindPlayer(who) + " (" + Tools.GetPlayerIP(who) + ") from '" + players[who].group.GetName() + "' group joined.");
Tools.ShowMOTD(who); Tools.ShowMOTD(who);
if (!players[who].group.HasPermission("ignorecheatdetection") && HackedHealth(who)) if (HackedHealth(who))
{ {
if (ConfigurationManager.banCheater || ConfigurationManager.kickCheater) Tools.HandleCheater(who, "Hacked health.");
{
string playerName = Tools.FindPlayer(who);
if (ConfigurationManager.banCheater)
Ban(who, "Hacked health.");
Tools.Kick(who, "Hacked health.");
Tools.Broadcast(playerName + " was " + (ConfigurationManager.banCheater ? "banned" : "kicked") + " for hacked health.");
}
} }
if (ConfigurationManager.permaPvp) if (ConfigurationManager.permaPvp)
{ {
@ -579,9 +516,7 @@ namespace TShockAPI
if (msg.whoAmI != ply) if (msg.whoAmI != ply)
{ {
Log.Info(Tools.FindPlayer(msg.whoAmI) + " was kicked for trying to fake chat as someone else."); e.Handled = Tools.HandleGriefer(ply, "Faking Chat"); ;
Ban(ply, "Faking Chat");
e.Handled = true;
} }
int x = (int)Main.player[ply].position.X; int x = (int)Main.player[ply].position.X;
@ -630,23 +565,22 @@ namespace TShockAPI
if (Tools.activePlayers() + 1 > ConfigurationManager.maxSlots && if (Tools.activePlayers() + 1 > ConfigurationManager.maxSlots &&
!players[ply].group.HasPermission("reservedslot")) !players[ply].group.HasPermission("reservedslot"))
{ {
Tools.Kick(ply, "Server is full"); Tools.ForceKick(ply, "Server is full");
handler.Handled = true; handler.Handled = true;
return;
} }
else
{
var ban = Bans.GetBanByIp(ip); var ban = Bans.GetBanByIp(ip);
if (ban != null) if (ban != null)
{ {
Tools.Kick(ply, "You are banned: " + ban.Reason); Tools.ForceKick(ply, "You are banned: " + ban.Reason);
handler.Handled = true; handler.Handled = true;
return;
} }
if (!FileTools.OnWhitelist(ip)) else if (!FileTools.OnWhitelist(ip))
{ {
Tools.Kick(ply, "Not on whitelist."); Tools.ForceKick(ply, "Not on whitelist.");
handler.Handled = true; handler.Handled = true;
return; }
} }
} }
@ -670,7 +604,7 @@ namespace TShockAPI
FileTools.CreateFile(FileTools.SaveDir + "auth.lck"); FileTools.CreateFile(FileTools.SaveDir + "auth.lck");
} }
ConfigurationManager.maxSlots = Main.maxPlayers - 1; //ConfigurationManager.maxSlots = Main.maxPlayers - 1;
} }
private void OnUpdate(GameTime time) private void OnUpdate(GameTime time)
@ -689,15 +623,8 @@ namespace TShockAPI
{ {
if (Main.player[i] != null) if (Main.player[i] != null)
{ {
if (ConfigurationManager.kickTnt || ConfigurationManager.banTnt) if (Tools.HandleTntUser(i, "Kill tile abuse detected."))
{ {
if (ConfigurationManager.banTnt)
Ban(i, "Kill Tile Abuse");
else
Tools.Kick(i, "Kill tile abuse detected.");
Tools.Broadcast(Main.player[i].name + " was " +
(ConfigurationManager.banTnt ? "banned" : "kicked") +
" for kill tile abuse.");
RevertKillTile(i); RevertKillTile(i);
players[i].tileThreshold = 0; players[i].tileThreshold = 0;
players[i].tilesDestroyed.Clear(); players[i].tilesDestroyed.Clear();
@ -903,15 +830,6 @@ namespace TShockAPI
return true; return true;
} }
public static void Ban(int plr, string 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 public class Position
{ {
public float X; public float X;

90
TShockAPI/Tools.cs Normal file → Executable file
View file

@ -207,21 +207,99 @@ namespace TShockAPI
} }
} }
/// <summary>
/// Kicks a player from the server without checking for immunetokick permission.
/// </summary>
/// <param name="ply">int player</param>
/// <param name="reason">string reason</param>
public static void ForceKick(int ply, string reason)
{
string ip = GetPlayerIP(ply);
NetMessage.SendData(0x2, ply, -1, reason, 0x0, 0f, 0f, 0f);
Log.Info(ip + " was force kicked for : " + reason);
}
/// <summary> /// <summary>
/// Kicks a player from the server. /// Kicks a player from the server.
/// </summary> /// </summary>
/// <param name="ply">int player</param> /// <param name="ply">int player</param>
/// <param name="reason">string reason</param> /// <param name="reason">string reason</param>
public static void Kick(int ply, string reason) public static bool Kick(int ply, string reason, string adminUserName = "")
{ {
if (!Netplay.serverSock[ply].active || Netplay.serverSock[ply].kill) if (!Netplay.serverSock[ply].active || Netplay.serverSock[ply].kill)
return; return true;
if (!TShock.players[ply].group.HasPermission("immunetokick") || reason.Contains("Banned: ")) if (!TShock.players[ply].group.HasPermission("immunetokick"))
{ {
string displayName = FindPlayer(ply).Equals("") ? GetPlayerIP(ply) : FindPlayer(ply); string playerName = Main.player[ply].name;
NetMessage.SendData(0x2, ply, -1, reason, 0x0, 0f, 0f, 0f); NetMessage.SendData(0x2, ply, -1, "Kicked: " + reason, 0x0, 0f, 0f, 0f);
Log.Info("Kicked " + displayName + " for : " + reason); Log.Info("Kicked " + playerName + " for : " + reason);
if (adminUserName.Length == 0)
Broadcast(playerName + " was kicked for " + reason.ToLower());
else
Tools.Broadcast(adminUserName + " kicked " + playerName + " for " + reason.ToLower());
return true;
} }
return false;
}
/// <summary>
/// Bans and kicks a player from the server.
/// </summary>
/// <param name="ply">int player</param>
/// <param name="reason">string reason</param>
public static bool Ban(int plr, string reason, string adminUserName = "")
{
if (!TShock.players[plr].group.HasPermission("immunetoban"))
{
string ip = GetPlayerIP(plr);
string playerName = Main.player[plr].name;
TShock.Bans.AddBan(ip, playerName, reason);
if (!Main.player[plr].active || Netplay.serverSock[plr].kill)
NetMessage.SendData(0x2, plr, -1, "Banned: " + reason, 0x0, 0f, 0f, 0f);
Log.Info("Banned " + playerName + " for : " + reason);
if (adminUserName.Length == 0)
Broadcast(playerName + " was banned for " + reason.ToLower());
else
Tools.Broadcast(adminUserName + " banned " + playerName + " for " + reason.ToLower());
return true;
}
return false;
}
public static bool HandleCheater(int ply, string reason)
{
return HandleBadPlayer(ply, "ignorecheatdetection", ConfigurationManager.banCheater, ConfigurationManager.kickCheater, reason);
}
public static bool HandleGriefer(int ply, string reason)
{
return HandleBadPlayer(ply, "ignoregriefdetection", ConfigurationManager.banGriefer, ConfigurationManager.kickGriefer, reason);
}
public static bool HandleTntUser(int ply, string reason)
{
return HandleBadPlayer(ply, "ignoregriefdetection", ConfigurationManager.banTnt, ConfigurationManager.kickTnt, reason);
}
public static bool HandleExplosivesUser(int ply, string reason)
{
return HandleBadPlayer(ply, "ignoregriefdetection", ConfigurationManager.banBoom, ConfigurationManager.kickBoom, reason);
}
private static bool HandleBadPlayer(int ply, string overridePermission, bool ban, bool kick, string reason)
{
if (!TShock.players[ply].group.HasPermission(overridePermission))
{
if (ban)
{
return Ban(ply, reason);
}
else if (kick)
{
return Kick(ply, reason);
}
}
return false;
} }
/// <summary> /// <summary>