mtcontrib/Minetest-WorldEdit
1
0
Fork 1
mirror of https://github.com/Uberi/Minetest-WorldEdit.git synced 2025-02-22 14:20:22 +01:00
Code Issues Releases Wiki Activity

code review fix

Browse Source
This commit is contained in:
Imre Péntek 2024-04-15 12:52:02 +02:00
parent 38a370c123
commit 73b9cd1776
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit/code.lua
View File

@ -13,22 +13,22 @@ function worldedit.lua(code, name)
end end
local factory, err = loadstring("return function(name, player, pos) " .. code .. " end") local factory, err = loadstring("return function(name, player, pos) " .. code .. " end")
if not factory then -- Syntax error if not factory then -- Syntax error
return false, err return err
end end
local func=factory() local func=factory()
local player local player
if name then if name then
player=minetest.get_player_by_name(name) player = minetest.get_player_by_name(name)
end end
local pos local pos
if player then if player then
pos=vector.round(player:get_pos()) pos = vector.round(player:get_pos())
end end
local good, err = pcall(func, name, player, pos) local good, err = pcall(func, name, player, pos)
if good then if good then
err=dump(err) return nil, dump(err)
end end
return good, err return err
end end

10
worldedit_commands/init.lua
View File

@ -1528,16 +1528,16 @@ worldedit.register_command("lua", {
return true, param return true, param
end, end,
func = function(name, param) func = function(name, param)
local good, ret = worldedit.lua(param, name) local ret = {worldedit.lua(param, name)}
if good then if type(ret[1]) == "nil" then
if ret ~= "nil" then if ret[2] ~= "nil" then
worldedit.player_notify(name, "code successfully executed, returns with " .. ret, false) worldedit.player_notify(name, "code successfully executed, returns with " .. ret[2], false)
else else
worldedit.player_notify(name, "code successfully executed", false) worldedit.player_notify(name, "code successfully executed", false)
end end
minetest.log("action", name .. " executed " .. param) minetest.log("action", name .. " executed " .. param)
else else
worldedit.player_notify(name, "code error: " .. dump(ret)) worldedit.player_notify(name, "code error: " .. dump(ret[1]))
minetest.log("action", name .. " tried to execute " .. param) minetest.log("action", name .. " tried to execute " .. param)
end end
end, end,