Skip to content

Commit

Permalink
Fix "Ignoring CONTENT_IGNORE redefinition" warning (minetest#4393)
Browse files Browse the repository at this point in the history
minetest.override_item still passes to core
  • Loading branch information
HybridDog authored and osjc committed Jan 13, 2019
1 parent 4be9a6b commit 60fabae
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion builtin/game/register.lua
Expand Up @@ -116,6 +116,8 @@ function core.register_item(name, itemdef)
end
itemdef.name = name

local is_overriding = core.registered_items[name]

-- Apply defaults and add to registered_* table
if itemdef.type == "node" then
-- Use the nodebox as selection box if it's not set manually
Expand Down Expand Up @@ -177,7 +179,13 @@ function core.register_item(name, itemdef)
--core.log("Registering item: " .. itemdef.name)
core.registered_items[itemdef.name] = itemdef
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

function core.unregister_item(name)
Expand Down

0 comments on commit 60fabae

Please sign in to comment.