Merge branch 'master' of github.com:TShock/TShock

This commit is contained in:
Shank 2011-06-05 23:27:32 -06:00
commit 8b99bfacc0
2 changed files with 2 additions and 2 deletions

View file

@ -334,7 +334,7 @@ namespace TShockAPI
if (givenCode == ConfigurationManager.authToken)
{
TextWriter tw = new StreamWriter(FileTools.SaveDir + "users.txt", true);
tw.WriteLine(Tools.GetRealIP(Convert.ToString(Netplay.serverSock[args.PlayerID].tcpClient.Client.RemoteEndPoint)) + " superadmin");
tw.Write("\n" + Tools.GetRealIP(Convert.ToString(Netplay.serverSock[args.PlayerID].tcpClient.Client.RemoteEndPoint)) + " superadmin");
Tools.SendMessage(args.PlayerID, "SuperAdmin authenticated. Please re-connect using the same IP.");
ConfigurationManager.authToken = 0;
tw.Close();

View file

@ -15,7 +15,7 @@
#ignoregriefdetection reservedslot
default null
vip null reservedslot
vip default reservedslot
newadmin default kick editspawn reservedslot
admin newadmin ban causeevents spawnboss spawnmob tp immunetokick kill
trustedadmin admin ignorecheatdetection maintenance cfg cheat pvpfun ignorecheatdetection immunetoban ignoregriefdetection