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
	TShockAPI/Tools.cs
This commit is contained in:
ricky 2011-06-07 23:07:14 +10:00
commit edffd29a69
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/TShock.cs
View file

@ -549,7 +549,6 @@ namespace TShockAPI
}
string ip = Tools.GetPlayerIP(ply);
players[ply] = new TSPlayer(ply);
players[ply].group = Tools.GetGroupForIP(ip);
@ -604,7 +603,7 @@ namespace TShockAPI
{
return;
}
for (uint i = 0; i < Main.maxPlayers; i++)
for (int i = 0; i < Main.maxPlayers; i++)
{
if (Main.player[i].active == false)
{
@ -614,9 +613,9 @@ namespace TShockAPI
{
if (Main.player[i] != null)
{
if (Tools.HandleTntUser((int)i, "Kill tile abuse detected."))
if (Tools.HandleTntUser(i, "Kill tile abuse detected."))
{
RevertKillTile((int)i);
RevertKillTile(i);
players[i].tileThreshold = 0;
players[i].tilesDestroyed.Clear();
}