sbrl-github/Minetest-WorldEditAdditions
1
0
Fork 0
mirror of https://github.com/sbrl/Minetest-WorldEditAdditions.git synced 2024-11-29 18:33:01 +00:00
Code Issues Releases Wiki Activity

run_command: accept 1 (bool) return value from main func()

Browse source
This commit is contained in:
Starbeamrainbowlabs 2024-10-17 23:44:31 +01:00
parent 5331b32159
commit 3d1c1b8674
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
worldeditadditions_core/core/run_command.lua
View file

@ -64,12 +64,14 @@ local function run_command_stage2(player_name, func, parse_result, tbl_event)
-- BELOW: We handle the IMMEDIATE RETURN VALUE. For async commands this requires special handling as the actual exit of async commands is above. -- BELOW: We handle the IMMEDIATE RETURN VALUE. For async commands this requires special handling as the actual exit of async commands is above.
-- If a function is async (pass `async = true` in the table passed to weac.register_command()`), then if there are no return values then we assume it was successful. -- If a function is async (pass `async = true` in the table passed to weac.register_command()`), then if there are no return values then we assume it was successful.
if #retvals ~= 2 and not tbl_event.cmddef.async then if (#retvals > 2 or #retvals < 1) and not tbl_event.cmddef.async then
weac.notify.error(player_name, "[//"..tostring(tbl_event.cmdname).."] This command is not async and the main execution function for it returned "..tostring(#retvals).." arguments instead of the expected 2 (success, message), so it is unclear whether it succeeded or not. This is a bug!") weac.notify.error(player_name, "[//"..tostring(tbl_event.cmdname).."] This command is not async and the main execution function for it returned "..tostring(#retvals).." arguments instead of the expected 2 (success, message), so it is unclear whether it succeeded or not. This is a bug!")
end end
if #retvals == 2 then if #retvals == 2 or #retvals == 1 then
local success, result_message = retvals[1], retvals[2] local success = retvals[1]
local result_message
if #retvals == 2 then result_message = retvals[2] end
success, result_message = handle_success_resultmsg(player_name, tbl_event.cmdname, success, result_message) success, result_message = handle_success_resultmsg(player_name, tbl_event.cmdname, success, result_message)
tbl_event.success = success tbl_event.success = success