Remove mapgen_air alias (#935)

diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua
index 070f4b1c356e4c653e7ae225449eb7bd026bb49f..8ff259c597bb2afdbdc8c823686b0fca9a8292bf 100644 (file)
--- 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 fa6a128eb68db0eb68203283fede129a79c48871..ada20a27c4471e530aced061403de14c63fdfb97 100644 (file)
--- 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;
                }