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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	TShockAPI/TShock.cs
This commit is contained in:
ricky 2011-06-08 06:53:54 +10:00
commit 4874a2bdd4
2 changed files with 62 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

27
TShockAPI/Commands.cs
View file

@ -78,6 +78,7 @@ namespace TShockAPI
{ {
commands.Add(new Command("kick", "kick", Kick)); commands.Add(new Command("kick", "kick", Kick));
commands.Add(new Command("ban", "ban", Ban)); commands.Add(new Command("ban", "ban", Ban));
commands.Add(new Command("banip", "ban", BanIP));
commands.Add(new Command("unban", "unban", UnBan)); commands.Add(new Command("unban", "unban", UnBan));
commands.Add(new Command("unbanip", "unbanip", UnBanIP)); commands.Add(new Command("unbanip", "unbanip", UnBanIP));
commands.Add(new Command("off", "maintenance", Off)); commands.Add(new Command("off", "maintenance", Off));
@ -216,6 +217,28 @@ namespace TShockAPI
new[] { 255f, 0f, 0f }); new[] { 255f, 0f, 0f });
} }
public static void BanIP(CommandArgs args)
{
if (args.Message.Split(' ').Length == 2)
{
string ip = args.Message.Split(' ')[1];
TShock.Bans.AddBan(ip, "", "Manually added IP address ban.");
} else if (args.Message.Split(' ').Length > 2)
{
string reason = "";
for (int i = 2; i > args.Message.Split(' ').Length;i++)
{
reason += args.Message.Split(' ')[i];
}
string ip = args.Message.Split(' ')[1];
TShock.Bans.AddBan(ip, "", reason);
}
else
{
Tools.SendMessage(args.PlayerID, "Syntax: /banip <ip> <reason>");
}
}
public static void Ban(CommandArgs args) public static void Ban(CommandArgs args)
{ {
string input = args.Message.Remove(0, 4).Trim(); string input = args.Message.Remove(0, 4).Trim();
@ -254,7 +277,7 @@ namespace TShockAPI
public static void UnBan(CommandArgs args) public static void UnBan(CommandArgs args)
{ {
string plStr = args.Message.Remove(0, 4); string plStr = args.Message.Remove(0, 6);
int adminplr = args.PlayerID; int adminplr = args.PlayerID;
var ban = TShock.Bans.GetBanByName(plStr); var ban = TShock.Bans.GetBanByName(plStr);
if (ban != null) if (ban != null)
@ -270,7 +293,7 @@ namespace TShockAPI
public static void UnBanIP(CommandArgs args) public static void UnBanIP(CommandArgs args)
{ {
string plStr = args.Message.Remove(0, 4); string plStr = args.Message.Remove(0, 8);
int adminplr = args.PlayerID; int adminplr = args.PlayerID;
var ban = TShock.Bans.GetBanByIp(plStr); var ban = TShock.Bans.GetBanByIp(plStr);
if (ban != null) if (ban != null)

64
TShockAPI/TShock.cs
View file

@ -200,29 +200,36 @@ namespace TShockAPI
private void GetData(GetDataEventArgs e) private void GetData(GetDataEventArgs e)
{ {
e.Handled = HandleGetData(e);
}
private bool HandleGetData(GetDataEventArgs e)
{
if (!Netplay.serverSock[e.Msg.whoAmI].active || Netplay.serverSock[e.Msg.whoAmI].kill)
return true;
if (e.MsgID == 4) if (e.MsgID == 4)
{ {
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.ForceKick(e.Msg.whoAmI, "You are banned: " + ban.Reason); Tools.ForceKick(e.Msg.whoAmI, "You are banned: " + ban.Reason);
e.Handled = true; return true;
return;
} }
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.ForceKick(e.Msg.whoAmI, "Name exceeded 32 characters."); Tools.ForceKick(e.Msg.whoAmI, "Name exceeded 32 characters.");
e.Handled = true; return true;
} }
else if (players[e.Msg.whoAmI] == null) if (players[e.Msg.whoAmI] == null)
{ {
Tools.ForceKick(e.Msg.whoAmI, "Player doesn't exist"); Tools.ForceKick(e.Msg.whoAmI, "Player doesn't exist");
e.Handled = true; return true;
} }
else if (players[e.Msg.whoAmI].receivedInfo) else if (players[e.Msg.whoAmI].receivedInfo)
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Sent client info more than once"); return Tools.HandleGriefer(e.Msg.whoAmI, "Sent client info more than once");
} }
else else
{ {
@ -242,7 +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)
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Send Tile Square Abuse"); return Tools.HandleGriefer(e.Msg.whoAmI, "Send Tile Square Abuse");
} }
} }
} }
@ -263,12 +270,13 @@ namespace TShockAPI
if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6)) if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6))
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Placing impossible to place blocks."); return Tools.HandleGriefer(e.Msg.whoAmI, "Placing impossible to place blocks.");
} }
} }
if (type == 0 || type == 1) if (type == 0 || type == 1)
{
if (ConfigurationManager.spawnProtect) if (ConfigurationManager.spawnProtect)
{
if (!players[e.Msg.whoAmI].group.HasPermission("editspawn")) if (!players[e.Msg.whoAmI].group.HasPermission("editspawn"))
{ {
var flag = CheckSpawn(x, y); var flag = CheckSpawn(x, y);
@ -276,16 +284,17 @@ namespace TShockAPI
{ {
Tools.SendMessage(e.Msg.whoAmI, "Spawn protected from changes.", Tools.SendMessage(e.Msg.whoAmI, "Spawn protected from changes.",
new[] { 255f, 0f, 0f }); new[] { 255f, 0f, 0f });
e.Handled = true; return true;
} }
} }
}
}
if (type == 0 && BlacklistTiles[Main.tile[x, y].type] && Main.player[e.Msg.whoAmI].active) if (type == 0 && BlacklistTiles[Main.tile[x, y].type] && Main.player[e.Msg.whoAmI].active)
{ {
players[e.Msg.whoAmI].tileThreshold++; players[e.Msg.whoAmI].tileThreshold++;
players[e.Msg.whoAmI].tilesDestroyed.Add(new Position(x, y), Main.tile[x, y]); players[e.Msg.whoAmI].tilesDestroyed.Add(new Position(x, y), Main.tile[x, y]);
} }
return;
} }
} }
else if (e.MsgID == 0x1e) else if (e.MsgID == 0x1e)
@ -301,24 +310,23 @@ namespace TShockAPI
if (ConfigurationManager.permaPvp) if (ConfigurationManager.permaPvp)
Main.player[e.Msg.whoAmI].hostile = true; Main.player[e.Msg.whoAmI].hostile = true;
NetMessage.SendData(30, -1, -1, "", e.Msg.whoAmI); NetMessage.SendData(30, -1, -1, "", e.Msg.whoAmI);
e.Handled = true; return true;
return;
} }
} }
else if (e.MsgID == 0x0A) //SendSection else if (e.MsgID == 0x0A) //SendSection
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "SendSection abuse."); return Tools.HandleGriefer(e.Msg.whoAmI, "SendSection abuse.");
} }
else if (e.MsgID == 0x17) //Npc Data else if (e.MsgID == 0x17) //Npc Data
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Spawn NPC abuse"); return Tools.HandleGriefer(e.Msg.whoAmI, "Spawn NPC abuse");
} }
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)
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Update Player abuse"); return Tools.HandleGriefer(e.Msg.whoAmI, "Update Player abuse");
} }
} }
else if (e.MsgID == 0x10) else if (e.MsgID == 0x10)
@ -333,7 +341,7 @@ namespace TShockAPI
{ {
if (players[ply].syncHP) if (players[ply].syncHP)
{ {
e.Handled = Tools.HandleCheater(ply, "Abnormal life increase"); return Tools.HandleCheater(ply, "Abnormal life increase");
} }
else else
{ {
@ -354,7 +362,7 @@ namespace TShockAPI
{ {
if (players[ply].syncMP) if (players[ply].syncMP)
{ {
e.Handled = Tools.HandleCheater(ply, "Abnormal mana increase"); return Tools.HandleCheater(ply, "Abnormal mana increase");
} }
else else
{ {
@ -379,7 +387,7 @@ namespace TShockAPI
if (type == 29 || type == 28 || type == 30) if (type == 29 || type == 28 || type == 30)
{ {
e.Handled = Tools.HandleExplosivesUser(e.Msg.whoAmI, "Throwing an explosive device."); return Tools.HandleExplosivesUser(e.Msg.whoAmI, "Throwing an explosive device.");
} }
} }
} }
@ -394,7 +402,7 @@ namespace TShockAPI
if (id != e.Msg.whoAmI) if (id != e.Msg.whoAmI)
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Trying to execute KillMe on someone else."); return Tools.HandleGriefer(e.Msg.whoAmI, "Trying to execute KillMe on someone else.");
} }
} }
} }
@ -408,7 +416,7 @@ namespace TShockAPI
byte pvp = br.ReadByte(); byte pvp = br.ReadByte();
if (!Main.player[playerid].hostile) if (!Main.player[playerid].hostile)
e.Handled = true; return true;
} }
} }
else if (e.MsgID == 0x30) else if (e.MsgID == 0x30)
@ -422,7 +430,7 @@ namespace TShockAPI
//The liquid was picked up. //The liquid was picked up.
if (liquid == 0) if (liquid == 0)
return; return false;
int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16); int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16);
int plyY = Math.Abs((int)Main.player[e.Msg.whoAmI].position.Y / 16); int plyY = Math.Abs((int)Main.player[e.Msg.whoAmI].position.Y / 16);
@ -442,15 +450,15 @@ namespace TShockAPI
if (lava && lavacount <= 0) if (lava && lavacount <= 0)
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Placing lava they didn't have."); ; return Tools.HandleGriefer(e.Msg.whoAmI, "Placing lava they didn't have."); ;
} }
else if (!lava && watercount <= 0) else if (!lava && watercount <= 0)
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Placing water they didn't have."); return Tools.HandleGriefer(e.Msg.whoAmI, "Placing water they didn't have.");
} }
if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6)) if ((Math.Abs(plyX - tileX) > 6) || (Math.Abs(plyY - tileY) > 6))
{ {
e.Handled = Tools.HandleGriefer(e.Msg.whoAmI, "Placing impossible to place liquid."); ; return Tools.HandleGriefer(e.Msg.whoAmI, "Placing impossible to place liquid."); ;
} }
if (ConfigurationManager.spawnProtect) if (ConfigurationManager.spawnProtect)
@ -461,7 +469,7 @@ namespace TShockAPI
if (flag) if (flag)
{ {
Tools.SendMessage(e.Msg.whoAmI, "The spawn is protected!", new[] { 255f, 0f, 0f }); Tools.SendMessage(e.Msg.whoAmI, "The spawn is protected!", new[] { 255f, 0f, 0f });
e.Handled = true; return true;
} }
} }
} }
@ -469,8 +477,10 @@ namespace TShockAPI
} }
else if (e.MsgID == 0x22) // Client only KillTile else if (e.MsgID == 0x22) // Client only KillTile
{ {
e.Handled = true; // Client only uses it for chests, but sends regular 17 as well. return true; // Client only uses it for chests, but sends regular 17 as well.
} }
return false;
} }
private void OnGreetPlayer(int who, HandledEventArgs e) private void OnGreetPlayer(int who, HandledEventArgs e)