From 6ddfc985d352d89b092be330065846b5b9ccac79 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Sat, 28 May 2022 15:06:22 -0300 Subject: [PATCH] fix AddCommand arguments being wrong and fixed getValidArgs not doing anything --- .../SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs index 92f10d7d2..43db145ad 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs @@ -349,14 +349,13 @@ namespace Barotrauma public void AddCommand(string name, string help, LuaCsAction onExecute, LuaCsFunc getValidArgs = null, bool isCheat = false) { - var cmd = new DebugConsole.Command(name, help, (string[] arg1) => { onExecute(arg1); }, + var cmd = new DebugConsole.Command(name, help, (string[] arg1) => { onExecute(new object[] { arg1 }); }, () => { - if (getValidArgs == null) return null; + if (getValidArgs == null) { return null; } var obj = getValidArgs(); - if (obj is LuaResult res) obj = res.Object(); - if (obj is string[][]) return (string[][])obj; - return null; + if (obj is LuaResult lr) { return lr.DynValue().ToObject(); } + return (string[][])obj; }, isCheat); luaAddedCommand.Add(cmd);