From: 0gb.us <us_0gb@laptop-0gb-us.0gb.us>
Date: Tue, 24 Sep 2013 06:15:38 +0000 (-0700)
Subject: Remove mapgen_air alias (#935)
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=afb27329fc05076876c19e90f8c4343efa540207;p=zefram%2Fminetest%2Fminetest_engine.git

Remove mapgen_air alias (#935)
---

diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua
index 070f4b1c..8ff259c5 100644
--- a/games/minimal/mods/default/mapgen.lua
+++ b/games/minimal/mods/default/mapgen.lua
@@ -4,7 +4,6 @@
 -- Aliases for map generator outputs
 --
 
-minetest.register_alias("mapgen_air", "air")
 minetest.register_alias("mapgen_stone", "default:stone")
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index fa6a128e..ada20a27 100644
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -209,7 +209,7 @@ class LiquidDropABM : public ActiveBlockModifier {
 		{ return contents; }
 		virtual std::set<std::string> getRequiredNeighbors() {
 			std::set<std::string> neighbors;
-			neighbors.insert("mapgen_air");
+			neighbors.insert("air");
 			return neighbors;
 		}
 		virtual float getTriggerInterval()
@@ -241,7 +241,7 @@ class LiquidFreeze : public ActiveBlockModifier {
 		}
 		virtual std::set<std::string> getRequiredNeighbors() {
 			std::set<std::string> s;
-			s.insert("mapgen_air");
+			s.insert("air");
 			s.insert("group:melts");
 			return s;
 		}
@@ -303,7 +303,7 @@ class LiquidMeltWeather : public ActiveBlockModifier {
 		}
 		virtual std::set<std::string> getRequiredNeighbors() {
 			std::set<std::string> s;
-			s.insert("mapgen_air");
+			s.insert("air");
 			s.insert("group:freezes");
 			return s;
 		}