minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-07-06 18:00:21 +02:00
Code Issues Releases Wiki Activity

Fix missing ignore textures (#7326)

Browse Source
This commit is contained in:
you
2018-05-20 14:51:50 +02:00
committed by SmallJoker
parent 6d6b894c7a
commit 22df02d25b
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nodedef.cpp
View File

@ -1228,15 +1228,9 @@ content_t NodeDefManager::set(const std::string &name, const ContentFeatures &de
{
// Pre-conditions
assert(name != "");
assert(name != "ignore");
assert(name == def.name);
// Don't allow redefining ignore (but allow air and unknown)
if (name == "ignore") {
warningstream << "NodeDefManager: Ignoring "
"CONTENT_IGNORE redefinition"<<std::endl;
return CONTENT_IGNORE;
}
content_t id = CONTENT_IGNORE;
if (!m_name_id_mapping.getId(name, id)) { // ignore aliases
// Get new id

9
src/script/lua_api/l_item.cpp
View File

@ -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 + ")");