Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Introduce builtin_shared and use it to fix #4778 

Fixes #4778 which was about the error:

ServerError: Lua: Runtime error from mod '' in callback item_OnPlace():
/usr/local/share/minetest/builtin/game/item.lua:278: attempt to call global 'check_attached_node' (a nil value)

The issue was a regression of commit 649448a2a9

"Rename nodeupdate and nodeupdate_single and make them part of the official API"
This commit is contained in:
est31 2016-11-16 10:17:46 +01:00
parent 5f0dc8e78a
commit afc48c802a
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/game/falling.lua
View File

@ -1,5 +1,7 @@
-- Minetest: builtin/item.lua -- Minetest: builtin/item.lua
local builtin_shared = ...
-- --
-- Falling stuff -- Falling stuff
-- --
@ -127,7 +129,7 @@ local function drop_attached_node(p)
end end
end end
local function check_attached_node(p, n) function builtin_shared.check_attached_node(p, n)
local def = core.registered_nodes[n.name] local def = core.registered_nodes[n.name]
local d = {x = 0, y = 0, z = 0} local d = {x = 0, y = 0, z = 0}
if def.paramtype2 == "wallmounted" then if def.paramtype2 == "wallmounted" then
@ -177,7 +179,7 @@ function core.check_single_for_falling(p)
end end
if core.get_item_group(n.name, "attached_node") ~= 0 then if core.get_item_group(n.name, "attached_node") ~= 0 then
if not check_attached_node(p, n) then if not builtin_shared.check_attached_node(p, n) then
drop_attached_node(p) drop_attached_node(p)
return true return true
end end

8
builtin/game/init.lua
View File

@ -3,10 +3,14 @@ local scriptpath = core.get_builtin_path()..DIR_DELIM
local commonpath = scriptpath.."common"..DIR_DELIM local commonpath = scriptpath.."common"..DIR_DELIM
local gamepath = scriptpath.."game"..DIR_DELIM local gamepath = scriptpath.."game"..DIR_DELIM
-- Shared between builtin files, but
-- not exposed to outer context
local builtin_shared = {}
dofile(commonpath.."vector.lua") dofile(commonpath.."vector.lua")
dofile(gamepath.."constants.lua") dofile(gamepath.."constants.lua")
dofile(gamepath.."item.lua") assert(loadfile(gamepath.."item.lua"))(builtin_shared)
dofile(gamepath.."register.lua") dofile(gamepath.."register.lua")
if core.setting_getbool("profiler.load") then if core.setting_getbool("profiler.load") then
@ -21,7 +25,7 @@ dofile(gamepath.."auth.lua")
dofile(gamepath.."chatcommands.lua") dofile(gamepath.."chatcommands.lua")
dofile(gamepath.."static_spawn.lua") dofile(gamepath.."static_spawn.lua")
dofile(gamepath.."detached_inventory.lua") dofile(gamepath.."detached_inventory.lua")
dofile(gamepath.."falling.lua") assert(loadfile(gamepath.."falling.lua"))(builtin_shared)
dofile(gamepath.."features.lua") dofile(gamepath.."features.lua")
dofile(gamepath.."voxelarea.lua") dofile(gamepath.."voxelarea.lua")
dofile(gamepath.."forceloading.lua") dofile(gamepath.."forceloading.lua")

4
builtin/game/item.lua
View File

@ -1,5 +1,7 @@
-- Minetest: builtin/item.lua -- Minetest: builtin/item.lua
local builtin_shared = ...
local function copy_pointed_thing(pointed_thing) local function copy_pointed_thing(pointed_thing)
return { return {
type = pointed_thing.type, type = pointed_thing.type,
@ -275,7 +277,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2)
-- Check if the node is attached and if it can be placed there -- Check if the node is attached and if it can be placed there
if core.get_item_group(def.name, "attached_node") ~= 0 and if core.get_item_group(def.name, "attached_node") ~= 0 and
not check_attached_node(place_to, newnode) then not builtin_shared.check_attached_node(place_to, newnode) then
core.log("action", "attached node " .. def.name .. core.log("action", "attached node " .. def.name ..
" can not be placed at " .. core.pos_to_string(place_to)) " can not be placed at " .. core.pos_to_string(place_to))
return itemstack, false return itemstack, false