BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix "Ignoring CONTENT_IGNORE redefinition" warning (#4393)

Browse Source 
minetest.override_item still passes to core
This commit is contained in:
you 2018-02-18 10:40:14 +01:00 committed by SmallJoker
parent ae6aed15cf
commit 46bbacee95
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/game/register.lua
View File

@ -116,6 +116,8 @@ function core.register_item(name, itemdef)
end end
itemdef.name = name itemdef.name = name
local is_overriding = core.registered_items[name]
-- Apply defaults and add to registered_* table -- Apply defaults and add to registered_* table
if itemdef.type == "node" then if itemdef.type == "node" then
-- Use the nodebox as selection box if it's not set manually -- Use the nodebox as selection box if it's not set manually
@ -177,7 +179,13 @@ function core.register_item(name, itemdef)
--core.log("Registering item: " .. itemdef.name) --core.log("Registering item: " .. itemdef.name)
core.registered_items[itemdef.name] = itemdef core.registered_items[itemdef.name] = itemdef
core.registered_aliases[itemdef.name] = nil core.registered_aliases[itemdef.name] = nil
register_item_raw(itemdef)
-- Used to allow builtin to register ignore to registered_items
if name ~= "ignore" then
register_item_raw(itemdef)
elseif is_overriding then
core.log("warning", "Attempted redefinition of \"ignore\"")
end
end end
function core.unregister_item(name) function core.unregister_item(name)