Merge branch 'develop' into group_work

# Conflicts:
#	FFXIVClassic Map Server/ConfigConstants.cs
This commit is contained in:
Filip Maj committed 2017-01-09 00:19:39 -05:00
commit 79de4fd1ff
14 files changed
+136 -24

No files matched your search

+1 -1
View File
@@ -207,7 +207,7 @@ namespace FFXIVClassic_Map_Server.lua
public static void RunGMCommand(Player player, String cmd, string[] param, bool help = false)
{
// load from scripts/commands/gm/ directory
var path = String.Format("./scripts/commands/gm/{0}.lua", cmd.ToString().ToLower());
var path = String.Format("./scripts/commands/gm/{0}.lua", cmd.ToLower());
// check if the file exists
if (File.Exists(path))