]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Fixed content_abm aliases
authordannydark <the_skeleton_of_a_child@yahoo.co.uk>
Thu, 3 Jan 2013 22:32:31 +0000 (22:32 +0000)
committerPilzAdam <PilzAdam@gmx.de>
Fri, 4 Jan 2013 18:05:57 +0000 (19:05 +0100)
Since commit 5a13c49492 when I'm in a new area of the world that hasn't
yet been generated the debug log gets flooded with the following error:

Map::setNode(): Not allowing to place CONTENT_IGNORE while trying to
replace "default:dirt_with_grass" at (729,1,-219) (block (45,0,-14))

This commit fixes that.

src/content_abm.cpp

index 5812c7b502b0f9d063a63b9f4039e9415f3f4d7c..9e65a7ab0a5c12c772a88754c14575abe7a482bc 100644 (file)
@@ -54,7 +54,7 @@ class GrowGrassABM : public ActiveBlockModifier
                                !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);
                }
        }
@@ -83,7 +83,7 @@ class RemoveGrassABM : public ActiveBlockModifier
                if(!ndef->get(n_top).light_propagates ||
                                ndef->get(n_top).isLiquid())
                {
-                       n.setContent(ndef->getId("dirt"));
+                       n.setContent(ndef->getId("mapgen_dirt"));
                        map->addNodeWithEvent(p, n);
                }
        }