Merge pull request #431 from sapier/dtime_clamping

[oweals/minetest.git] / src / content_abm.cpp

diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 5812c7b502b0f9d063a63b9f4039e9415f3f4d7c..ce1751117630d7b84488dde3dc93d84595fe17a2 100644 (file)
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -54,7 +54,7 @@ public:
                                !ndef->get(n_top).isLiquid() &&
                                n_top.getLightBlend(env->getDayNightRatio(), ndef) >= 13)
                {
-                       n.setContent(ndef->getId("dirt_with_grass"));
+                       n.setContent(ndef->getId("mapgen_dirt_with_grass"));
                        map->addNodeWithEvent(p, n);
                }
        }
@@ -80,10 +80,11 @@ public:
                ServerMap *map = &env->getServerMap();
                
                MapNode n_top = map->getNodeNoEx(p+v3s16(0,1,0));
-               if(!ndef->get(n_top).light_propagates ||
+               if((!ndef->get(n_top).light_propagates &&
+                               n_top.getContent() != CONTENT_IGNORE) ||
                                ndef->get(n_top).isLiquid())
                {
-                       n.setContent(ndef->getId("dirt"));
+                       n.setContent(ndef->getId("mapgen_dirt"));
                        map->addNodeWithEvent(p, n);
                }
        }