mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-20 11:47:48 +00:00
Code Activity

Merge branch 'develop' into lua_waiters

Browse source
This commit is contained in:
Filip Maj 2017-04-02 14:29:37 -04:00
commit 248ea0cce1
5 changed files with 59 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
FFXIVClassic Lobby Server/ConfigConstants.cs
View file

@ -64,7 +64,22 @@ namespace FFXIVClassic_Lobby_Server
if (UInt16.TryParse(val, out port) && (legit = true)) if (UInt16.TryParse(val, out port) && (legit = true))
OPTIONS_PORT = val; OPTIONS_PORT = val;
} }
else if (arg == "user" && (legit = true))
{
DATABASE_USERNAME = val;
}
else if (arg == "p" && (legit = true))
{
DATABASE_PASSWORD = val;
}
else if (arg == "db" && (legit = true))
{
DATABASE_NAME = val;
}
else if (arg == "host" && (legit = true))
{
DATABASE_HOST = val;
}
if (!legit) if (!legit)
{ {
Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg); Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);

17
FFXIVClassic Map Server/ConfigConstants.cs
View file

@ -70,7 +70,22 @@ namespace FFXIVClassic_Map_Server
if (UInt16.TryParse(val, out port) && (legit = true)) if (UInt16.TryParse(val, out port) && (legit = true))
OPTIONS_PORT = val; OPTIONS_PORT = val;
} }
else if (arg == "user" && (legit = true))
{
DATABASE_USERNAME = val;
}
else if (arg == "p" && (legit = true))
{
DATABASE_PASSWORD = val;
}
else if (arg == "db" && (legit = true))
{
DATABASE_NAME = val;
}
else if (arg == "host" && (legit = true))
{
DATABASE_HOST = val;
}
if (!legit) if (!legit)
{ {
Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg); Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);

17
FFXIVClassic World Server/ConfigConstants.cs
View file

@ -69,7 +69,22 @@ namespace FFXIVClassic_World_Server
if (UInt16.TryParse(val, out port) && (legit = true)) if (UInt16.TryParse(val, out port) && (legit = true))
OPTIONS_PORT = val; OPTIONS_PORT = val;
} }
else if (arg == "user" && (legit = true))
{
DATABASE_USERNAME = val;
}
else if (arg == "p" && (legit = true))
{
DATABASE_PASSWORD = val;
}
else if (arg == "db" && (legit = true))
{
DATABASE_NAME = val;
}
else if (arg == "host" && (legit = true))
{
DATABASE_HOST = val;
}
if (!legit) if (!legit)
{ {
Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg); Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);

4
sql/gamedata_actor_class.sql
View file

@ -6,7 +6,7 @@ Target Host: localhost
Target Database: ffxiv_server Target Database: ffxiv_server
Date: 4/2/2017 2:27:36 PM Date: 4/2/2017 2:27:36 PM
*/ */
SET autocommit=0;
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
-- ---------------------------- -- ----------------------------
-- Table structure for gamedata_actor_class -- Table structure for gamedata_actor_class
@ -8007,3 +8007,5 @@ INSERT INTO `gamedata_actor_class` VALUES ('9220405', '', '2', '0', null);
INSERT INTO `gamedata_actor_class` VALUES ('9220406', '', '2', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('9220406', '', '2', '0', null);
INSERT INTO `gamedata_actor_class` VALUES ('9220407', '', '2', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('9220407', '', '2', '0', null);
INSERT INTO `gamedata_actor_class` VALUES ('9220408', '', '2', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('9220408', '', '2', '0', null);
COMMIT;