aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordannydark <the_skeleton_of_a_child@yahoo.co.uk>2013-01-03 22:32:31 +0000
committerPilzAdam <PilzAdam@gmx.de>2013-01-04 19:05:57 +0100
commitbc879a1453561259b69c9a6602f97062b710235d (patch)
tree57a9f85349ebe6d7ddf53edd12fd15c39c10bf85
parent82fd83fd12e23ad7c61b4c7ae525be745b5236a5 (diff)
downloadminetest-bc879a1453561259b69c9a6602f97062b710235d.tar.gz
minetest-bc879a1453561259b69c9a6602f97062b710235d.tar.bz2
minetest-bc879a1453561259b69c9a6602f97062b710235d.zip
Fixed content_abm aliases
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.
-rw-r--r--src/content_abm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 5812c7b50..9e65a7ab0 100644
--- 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);
}
}
@@ -83,7 +83,7 @@ public:
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);
}
}