From 22df02d25bb1ddb1de48e645c5256621ce9a9ed9 Mon Sep 17 00:00:00 2001
From: you <ovvv@web.de>
Date: Sun, 20 May 2018 14:51:50 +0200
Subject: Fix missing ignore textures (#7326)

---
 src/script/lua_api/l_item.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/script/lua_api/l_item.cpp')

diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index d7e9f0a5b..46c1c98a0 100644
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -536,11 +536,16 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 	idef->registerItem(def);
 
 	// Read the node definition (content features) and register it
-	if(def.type == ITEM_NODE){
+	if (def.type == ITEM_NODE) {
 		ContentFeatures f = read_content_features(L, table);
+		// when a mod reregisters ignore, only texture changes and such should
+		// be done
+		if (f.name == "ignore")
+			return 0;
+
 		content_t id = ndef->set(f.name, f);
 
-		if(id > MAX_REGISTERED_CONTENT){
+		if (id > MAX_REGISTERED_CONTENT) {
 			throw LuaError("Number of registerable nodes ("
 					+ itos(MAX_REGISTERED_CONTENT+1)
 					+ ") exceeded (" + name + ")");
-- 
cgit v1.2.3