From: you <ovvv@web.de>
Date: Sun, 18 Feb 2018 09:40:14 +0000 (+0100)
Subject: Fix "Ignoring CONTENT_IGNORE redefinition" warning (#4393)
X-Git-Tag: 0.4.17~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2a4fbbbff8f555df9984fbff054fe91b1a471d8f;p=oweals%2Fminetest.git

Fix "Ignoring CONTENT_IGNORE redefinition" warning (#4393)

minetest.override_item still passes to core
---

diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index ec6f28097..25af24eb7 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)