From 46bbacee95b8cc68b7e531232a319ed46c2e1560 Mon Sep 17 00:00:00 2001 From: you Date: Sun, 18 Feb 2018 10:40:14 +0100 Subject: [PATCH] Fix "Ignoring CONTENT_IGNORE redefinition" warning (#4393) minetest.override_item still passes to core --- builtin/game/register.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/game/register.lua b/builtin/game/register.lua index 15d9b42d0..5ce8caf3a 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -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 @@ -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) -- 2.25.1