From: dannydark <the_skeleton_of_a_child@yahoo.co.uk>
Date: Thu, 3 Jan 2013 22:32:31 +0000 (+0000)
Subject: Fixed content_abm aliases
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=bc879a1453561259b69c9a6602f97062b710235d;p=zefram%2Fminetest%2Fminetest_engine.git

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.
---

diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 5812c7b5..9e65a7ab 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);
 		}
 	}