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 'develop' into group_work

Browse Source 
# Conflicts:
#	FFXIVClassic Map Server/ConfigConstants.cs
This commit is contained in:
Filip Maj
2017-01-09 00:19:39 -05:00
parent bc72147622 f4e238f4be
commit 79de4fd1ff
14 changed files with 136 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FFXIVClassic Map Server/Program.cs
View File

@@ -31,8 +31,8 @@ namespace FFXIVClassic_Map_Server
Program.Log.Info("---------FFXIV 1.0 Map Server---------");
//Load Config
if (!ConfigConstants.Load())
startServer = false;
ConfigConstants.Load();
ConfigConstants.ApplyLaunchArgs(args);
//Test DB Connection
Program.Log.Info("Testing DB connection... ");