mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-06-09 22:14:39 +02:00
Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands
# Conflicts: # FFXIVClassic Common Class Lib/packages.config # FFXIVClassic Lobby Server/Program.cs # FFXIVClassic Map Server/CommandProcessor.cs # FFXIVClassic Map Server/Program.cs # FFXIVClassic Map Server/actors/Actor.cs
This commit is contained in:
commit
37d91480f9
24 changed files with 185 additions and 138 deletions
|
@ -28,10 +28,6 @@ namespace FFXIVClassic_Lobby_Server
|
|||
if (!ConfigConstants.Load())
|
||||
startServer = false;
|
||||
|
||||
Assembly assem = Assembly.GetExecutingAssembly();
|
||||
Version vers = assem.GetName().Version;
|
||||
Program.Log.Info("Version: " + vers.ToString());
|
||||
|
||||
//Test DB Connection
|
||||
Program.Log.Info("Testing DB connection to \"{0}\"... ", ConfigConstants.DATABASE_HOST);
|
||||
using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
|
||||
|
@ -55,9 +51,7 @@ namespace FFXIVClassic_Lobby_Server
|
|||
{
|
||||
Server server = new Server();
|
||||
server.StartServer();
|
||||
|
||||
while (true)
|
||||
Thread.Sleep(1000);
|
||||
while (true) Thread.Sleep(10000);
|
||||
}
|
||||
|
||||
Program.Log.Info("Press any key to continue...");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue