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

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

Browse source
This commit is contained in:
Maverick Motherfucker 2011-06-05 14:45:49 -07:00
commit 71fbced8bb
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TShockAPI/Commands.cs
View file

@ -331,6 +331,7 @@ namespace TShockAPI
tw.WriteLine(Tools.GetRealIP(Convert.ToString(Netplay.serverSock[args.PlayerID].tcpClient.Client.RemoteEndPoint)) + " superadmin"); tw.WriteLine(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."); Tools.SendMessage(args.PlayerID, "SuperAdmin authenticated. Please re-connect using the same IP.");
ConfigurationManager.authToken = 0; ConfigurationManager.authToken = 0;
tw.Close();
} }
} }

16
TShockAPI/TShock.cs
View file

@ -112,14 +112,6 @@ namespace TShockAPI
Console.WriteLine(ex.ToString()); Console.WriteLine(ex.ToString());
} }
Console.WriteLine("TShock Version " + Version.Major + "." + Version.Minor + "." + Version.Build + "." + Version.Revision + " (" + VersionCodename + ") now running."); Console.WriteLine("TShock Version " + Version.Major + "." + Version.Minor + "." + Version.Build + "." + Version.Revision + " (" + VersionCodename + ") now running.");
if (!System.IO.File.Exists(FileTools.SaveDir + "auth.lck"))
{
Random r = new Random((int)System.DateTime.Now.ToBinary());
ConfigurationManager.authToken = r.Next(100000, 10000000);
Console.WriteLine("TShock Notice: To become SuperAdmin, join the game and type /auth " + ConfigurationManager.authToken);
Console.WriteLine("This token will only display ONCE.");
FileTools.CreateFile(FileTools.SaveDir + "auth.lck");
}
Log.Initialize(FileTools.SaveDir + "log.txt", LogLevel.All, true); Log.Initialize(FileTools.SaveDir + "log.txt", LogLevel.All, true);
Log.Info("Starting..."); Log.Info("Starting...");
GameHooks.OnPreInitialize += OnPreInit; GameHooks.OnPreInitialize += OnPreInit;
@ -487,6 +479,14 @@ namespace TShockAPI
void OnPostInit() void OnPostInit()
{ {
if (!System.IO.File.Exists(FileTools.SaveDir + "auth.lck"))
{
Random r = new Random((int)System.DateTime.Now.ToBinary());
ConfigurationManager.authToken = r.Next(100000, 10000000);
Console.WriteLine("TShock Notice: To become SuperAdmin, join the game and type /auth " + ConfigurationManager.authToken);
Console.WriteLine("This token will only display ONCE.");
FileTools.CreateFile(FileTools.SaveDir + "auth.lck");
}
} }
void OnUpdate(GameTime time) void OnUpdate(GameTime time)

4
release-docs/changes.txt
View file

@ -1,6 +1,10 @@
For the full list of changes, please take a look at GitHub: For the full list of changes, please take a look at GitHub:
https://github.com/TShock/TShock/commits/master https://github.com/TShock/TShock/commits/master
Changes in API release 1.8.0.0:
- Added permissions system for managing different levels of admins
- Fixed spawnrate and max spawns
Changes in API release 1.6.0.0: Changes in API release 1.6.0.0:
- Added spawn protection - Added spawn protection
- Fixed numerous bugs - Fixed numerous bugs