oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code 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