Increase liquid_loop_max to 10000 again

[dragonfireclient.git] / src / mapgen.cpp

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 301601b6c4441fbb64c260b6df7afe39c2b0b129..f6311849139ad9956cc99fa7f1da0d984cb3a14a 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -382,7 +382,7 @@ void Decoration::placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 void DecoSimple::resolveNodeNames(INodeDefManager *ndef) {
        Decoration::resolveNodeNames(ndef);
        
-       if (c_deco == CONTENT_IGNORE) {
+       if (c_deco == CONTENT_IGNORE && !decolist_names.size()) {
                c_deco = ndef->getId(deco_name);
                if (c_deco == CONTENT_IGNORE) {
                        errorstream << "DecoSimple::resolveNodeNames: decoration node '"
@@ -394,7 +394,7 @@ void DecoSimple::resolveNodeNames(INodeDefManager *ndef) {
                c_spawnby = ndef->getId(spawnby_name);
                if (c_spawnby == CONTENT_IGNORE) {
                        errorstream << "DecoSimple::resolveNodeNames: spawnby node '"
-                               << deco_name << "' not defined" << std::endl;
+                               << spawnby_name << "' not defined" << std::endl;
                        nspawnby = -1;
                        c_spawnby = CONTENT_AIR;
                }