cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands

Browse Source 
# 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:
Tahir Akhlaq
2016-06-18 05:59:42 +01:00
parent 1ad2b5d7d0 cdf4b3a2f2
commit 37d91480f9
24 changed files with 185 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FFXIVClassic Lobby Server/ConfigConstants.cs
View File

@@ -18,11 +18,11 @@ namespace FFXIVClassic_Lobby_Server
public static bool Load()
{
Program.Log.Info("Loading lobby_config.ini file... ");
Program.Log.Info("Loading lobby_config.ini file");
if (!File.Exists("./lobby_config.ini"))
{
Program.Log.Error("[FILE NOT FOUND]");
Program.Log.Error("FILE NOT FOUND!");
return false;
}
@@ -38,8 +38,6 @@ namespace FFXIVClassic_Lobby_Server
ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", "");
ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", "");
Program.Log.Info("[OK]");
return true;
}
}

8
FFXIVClassic Lobby Server/Program.cs
View File

@@ -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...");

2
FFXIVClassic Lobby Server/Server.cs
View File

@@ -81,7 +81,7 @@ namespace FFXIVClassic_Lobby_Server
}
Console.ForegroundColor = ConsoleColor.White;
Program.Log.Debug("Lobby Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port);
Program.Log.Info("Lobby Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port);
Console.ForegroundColor = ConsoleColor.Gray;
mProcessor = new PacketProcessor();