From afb27329fc05076876c19e90f8c4343efa540207 Mon Sep 17 00:00:00 2001 From: "0gb.us" Date: Mon, 23 Sep 2013 23:15:38 -0700 Subject: Remove mapgen_air alias (#935) --- games/minimal/mods/default/mapgen.lua | 1 - src/content_abm.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua index 070f4b1c3..8ff259c59 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 fa6a128eb..ada20a27c 100644 --- a/src/content_abm.cpp +++ b/src/content_abm.cpp @@ -209,7 +209,7 @@ class LiquidDropABM : public ActiveBlockModifier { { return contents; } virtual std::set getRequiredNeighbors() { std::set neighbors; - neighbors.insert("mapgen_air"); + neighbors.insert("air"); return neighbors; } virtual float getTriggerInterval() @@ -241,7 +241,7 @@ class LiquidFreeze : public ActiveBlockModifier { } virtual std::set getRequiredNeighbors() { std::set 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 getRequiredNeighbors() { std::set s; - s.insert("mapgen_air"); + s.insert("air"); s.insert("group:freezes"); return s; } -- cgit v1.2.3