diff options
| author | Michael VanOverbeek <[email protected]> | 2017-03-09 14:43:03 +0000 |
|---|---|---|
| committer | Michael VanOverbeek <[email protected]> | 2017-03-09 14:43:11 +0000 |
| commit | a9d7195f1e631a88386cf58dd1e33e36cba28a69 (patch) | |
| tree | d5e6be2f204ee36b2999e59ce48b03f8d9c0f139 | |
| parent | abe535200bb348af6288b7cc7d3405b2fea8ffa6 (diff) | |
| download | shiftos_thereturn-a9d7195f1e631a88386cf58dd1e33e36cba28a69.tar.gz shiftos_thereturn-a9d7195f1e631a88386cf58dd1e33e36cba28a69.tar.bz2 shiftos_thereturn-a9d7195f1e631a88386cf58dd1e33e36cba28a69.zip | |
make script runner less drunk
| -rw-r--r-- | ShiftOS.Server/Core.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ShiftOS.Server/Core.cs b/ShiftOS.Server/Core.cs index 4ec421d..a602240 100644 --- a/ShiftOS.Server/Core.cs +++ b/ShiftOS.Server/Core.cs @@ -96,10 +96,11 @@ namespace ShiftOS.Server { Name = "run", GUID = "Server", - Contents = $@"{{ - script:""{File.ReadAllText($"scripts/{user}/{script}.lua").Replace("\"", "\\\"")}"", - args:""{sArgs}"" - }}" + Contents = JsonConvert.SerializeObject(new + { + script = File.ReadAllText($"scripts/{user}/{script}.lua"), + args = sArgs + }) })); } else @@ -115,7 +116,7 @@ namespace ShiftOS.Server { Name = "Error", GUID = "Server", - Contents = JsonConvert.SerializeObject(new MudException("Command parse error")) + Contents = JsonConvert.SerializeObject(new MudException("<script_runner> Script not found or script error detected.")) })); } catch @@ -182,8 +183,8 @@ namespace ShiftOS.Server GUID = "server", Contents = JsonConvert.SerializeObject(saveFile) })); + return; } - return; } } foreach (var sve in Directory.GetFiles("saves")) @@ -199,8 +200,8 @@ namespace ShiftOS.Server GUID = "server", Contents = JsonConvert.SerializeObject(saveFile) })); + return; } - return; } } |