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

Merge or some shit

Browse source
This commit is contained in:
Maverick Motherfucker 2011-05-30 02:00:36 -07:00
commit 9006ffbd96
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -43,10 +43,17 @@ Thumbs.db
*.suo *.suo
*.sdf *.sdf
*.opensdf *.opensdf
<<<<<<< HEAD
*.csproj.user *.csproj.user
=======
>>>>>>> 3ccdba9f51710ccb56e021dd10e53eea3614f21f
*.cache *.cache
*.txt *.txt
<<<<<<< HEAD <<<<<<< HEAD
======= =======
*.pdb *.pdb
<<<<<<< HEAD
>>>>>>> ef60c83b40be0a7948d3cb0381cc6e4526a9b2d6 >>>>>>> ef60c83b40be0a7948d3cb0381cc6e4526a9b2d6
=======
*.csproj.user
>>>>>>> 3ccdba9f51710ccb56e021dd10e53eea3614f21f

26
TShockAPI/TShock.cs
View file

@ -63,7 +63,17 @@ namespace TShockAPI
ServerHooks.OnChat += new Action<int, string, HandledEventArgs>(OnChat); ServerHooks.OnChat += new Action<int, string, HandledEventArgs>(OnChat);
NetHooks.OnPreGetData += GetData; NetHooks.OnPreGetData += GetData;
ServerHooks.OnJoin += new Action<int, AllowEventArgs>(OnJoin); ServerHooks.OnJoin += new Action<int, AllowEventArgs>(OnJoin);
//NetHooks.OnGreetPlayer += new NetHooks.GreetPlayerD(OnGreetPlayer); NetHooks.OnGreetPlayer += new NetHooks.GreetPlayerD(OnGreetPlayer);
NetHooks.OnPreGetData += new NetHooks.GetDataD(OnPreGetData);
}
void OnPreGetData(byte id, messageBuffer msg, int idx, int length, HandledEventArgs e)
{
if (id == 0x1e && permaPvp)
{
e.Handled = true;
}
} }
/* /*
@ -366,6 +376,7 @@ namespace TShockAPI
string ip = GetRealIP(Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint)); string ip = GetRealIP(Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint));
WriteGrief(ply); WriteGrief(ply);
WriteCheater(ply);
if (!kickCheater) { return; } if (!kickCheater) { return; }
Netplay.serverSock[ply].kill = true; Netplay.serverSock[ply].kill = true;
Netplay.serverSock[ply].Reset(); Netplay.serverSock[ply].Reset();
@ -491,6 +502,19 @@ namespace TShockAPI
if (value.CompareTo(min) < 0) if (value.CompareTo(min) < 0)
result = min; result = min;
return result; return result;
}
public static void WriteCheater(int ply)
{
string ip = GetRealIP(Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint));
string cheaters = "";
TextReader tr = new StreamReader(saveDir + "cheaters.txt");
cheaters = tr.ReadToEnd();
tr.Close();
if (cheaters.Contains(Main.player[ply].name) && cheaters.Contains(ip)) { return; }
TextWriter sw = new StreamWriter(saveDir + "cheaters.txt", true);
sw.WriteLine("[" + Main.player[ply].name + "] " + "[" + ip + "]");
sw.Close();
} }
private static string GetPlayers() private static string GetPlayers()