shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more MUD fixes

Browse source
This commit is contained in:
Michael VanOverbeek 2017-02-13 22:12:23 +00:00
parent 9533b7b98f
commit eb1427f2b1
1 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
ShiftOS.Server/Core.cs
View file

@ -44,41 +44,48 @@ namespace ShiftOS.Server
[MudRequest("script")]
public static void RunScript(string guid, object contents)
{
var args = contents as Dictionary<string, string>;
string user = "";
string script = "";
string sArgs = "";
if (!args.ContainsKey("user"))
throw new MudException("No 'user' arg specified in message to server");
if (!args.ContainsKey("script"))
throw new MudException("No 'script' arg specified in message to server");
if (!args.ContainsKey("args"))
throw new MudException("No 'args' arg specified in message to server");
user = args["user"] as string;
script = args["script"] as string;
sArgs = args["args"] as string;
if (File.Exists($"scripts/{user}/{script}.lua"))
try
{
var script_arguments = JsonConvert.DeserializeObject<Dictionary<string, object>>(sArgs);
server.DispatchTo(new Guid(guid), new NetObject("runme", new ServerMessage
var args = JsonConvert.DeserializeObject<Dictionary<string, object>>(JsonConvert.SerializeObject(contents));
string user = "";
string script = "";
string sArgs = "";
if (!args.ContainsKey("user"))
throw new MudException("No 'user' arg specified in message to server");
if (!args.ContainsKey("script"))
throw new MudException("No 'script' arg specified in message to server");
if (!args.ContainsKey("args"))
throw new MudException("No 'args' arg specified in message to server");
user = args["user"] as string;
script = args["script"] as string;
sArgs = args["args"] as string;
if (File.Exists($"scripts/{user}/{script}.lua"))
{
Name = "run",
GUID = "Server",
Contents = $@"{{
var script_arguments = JsonConvert.DeserializeObject<Dictionary<string, object>>(sArgs);
server.DispatchTo(new Guid(guid), new NetObject("runme", new ServerMessage
{
Name = "run",
GUID = "Server",
Contents = $@"{{
script:""{File.ReadAllText($"scripts/{user}/{script}.lua").Replace("\"", "\\\"")}"",
args:""{sArgs}""
}}"
}));
}));
}
else
{
throw new MudException($"{user}.{script}: Script not found.");
}
}
else
catch
{
throw new MudException($"{user}.{script}: Script not found.");
throw new MudException($"Command parse error.");
}
}