Merge pull request #310 from Zidonuke/general-devel

Revert "Added Terrarianet.com server list scan bot support."
This commit is contained in:
Lucas Nicodemus 2011-12-07 20:15:59 -08:00
commit cb653f6237

View file

@ -488,7 +488,6 @@ namespace TShockAPI
private void OnJoin(int ply, HandledEventArgs handler)
{
var player = new TSPlayer(ply);
if (Config.EnableDNSHostResolution)
{
player.Group = Users.GetGroupForIPExpensive(player.IP);
@ -656,33 +655,6 @@ namespace TShockAPI
if (e.Handled)
return;
if (e.MsgID == PacketTypes.ChatText && Players[e.Msg.whoAmI] == null) //Make sure we dont process every single god damn packet
{
string ip = Netplay.serverSock[e.Msg.whoAmI].tcpClient.Client.RemoteEndPoint.ToString();
ip = ip.Substring(0, ip.IndexOf(":"));
if (ip == "69.163.229.106")
{
string str = "";
for (int i = 0; i < 0xff; i++)
{
if (Main.player[i].active)
{
if (str == "")
{
str = str + Main.player[i].name;
}
else
{
str = str + ", " + Main.player[i].name;
}
}
}
NetMessage.SendData(0x02, e.Msg.whoAmI, -1, "terraria net scanbot TShock " + VersionNum + ": " + str + ".");
e.Handled = true;
return;
}
}
PacketTypes type = e.MsgID;
Debug.WriteLine("Recv: {0:X}: {2} ({1:XX})", e.Msg.whoAmI, (byte)type, type);