Skip to content
Permalink
Browse files

Also print help commands to chat for server terminal (#8869)

  • Loading branch information
TranslucentSabre authored and sfan5 committed Sep 18, 2019
1 parent 6a7f5c0 commit c413eeb0260e143ada3f2c1915bda07602e06fa1
Showing with 18 additions and 3 deletions.
  1. +7 −0 builtin/common/chatcommands.lua
  2. +11 −3 builtin/common/information_formspecs.lua
@@ -77,6 +77,13 @@ local function do_help_cmd(name, param)
end
table.sort(cmds)
return true, gettext("Available commands:").."\n"..table.concat(cmds, "\n")
elseif INIT == "game" and param == "privs" then
local privs = {}
for priv, def in pairs(core.registered_privileges) do
privs[#privs + 1] = priv .. ": " .. def.description
end
table.sort(privs)
return true, "Available privileges:\n"..table.concat(privs, "\n")
else
local cmd = param
local def = core.registered_chatcommands[cmd]
@@ -81,7 +81,7 @@ local function build_chatcommands_formspec(name, sel, copy)
end


-- PRIVILEGES FORMSPEC
-- PRIVILEGES FORMSPEC

local function build_privs_formspec(name)
local privs = {}
@@ -128,15 +128,23 @@ local help_command = core.registered_chatcommands["help"]
local old_help_func = help_command.func

help_command.func = function(name, param)
local admin = core.settings:get("name")

-- If the admin ran help, put the output in the chat buffer as well to
-- work with the server terminal
if param == "privs" then
core.show_formspec(name, "__builtin:help_privs",
build_privs_formspec(name))
return
if name ~= admin then
return
end
end
if param == "" or param == "all" then
core.show_formspec(name, "__builtin:help_cmds",
build_chatcommands_formspec(name))
return
if name ~= admin then
return
end
end

return old_help_func(name, param)

0 comments on commit c413eeb

Please sign in to comment.
You can’t perform that action at this time.