minetest-mods
/
MoreMesecons
mirror of https://github.com/minetest-mods/MoreMesecons.git
1
0
Fork 1
Code Issues Releases Wiki Activity

LuaBlock: don't set the function environment + remove created pos global

This commit is contained in:
upsilon 2017-05-02 18:26:09 +02:00
parent abe8368e32
commit e1d2e84746
No known key found for this signature in database
GPG Key ID: A80DAE1F266E1C3C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moremesecons_luablock/init.lua
View File

@ -81,8 +81,8 @@ minetest.register_node("moremesecons_luablock:luablock", {
return meta:get_string("owner") == player:get_player_name()
end,
mesecons = {effector = {
action_on = function(pos, node)
local meta = minetest.get_meta(pos)
action_on = function(npos, node)
local meta = minetest.get_meta(npos)
local code = meta:get_string("code")
if code == "" then
return
@ -98,11 +98,12 @@ minetest.register_node("moremesecons_luablock:luablock", {
make_formspec(meta, pos)
return
end
local env = _G
env.pos = table.copy(pos)
setfenv(func, env)
-- Set the "pos" global
local old_pos = pos -- In case there's already an existing "pos" global
pos = table.copy(npos)
local good, err = pcall(func)
-- Still alive! No shutdown requested? No infinite loop?
pos = old_pos
if not good then -- Runtime error
meta:set_string("errmsg", err)
make_formspec(meta, pos)