diff options
author | 0gb.us <us_0gb@laptop-0gb-us.0gb.us> | 2013-09-23 23:15:38 -0700 |
---|---|---|
committer | Kahrl <kahrl@gmx.net> | 2013-10-05 18:42:31 +0200 |
commit | afb27329fc05076876c19e90f8c4343efa540207 (patch) | |
tree | b83a0934e92f87c512f84afd7eb4da57d7fcabd1 | |
parent | 2170c9958a455c228459c795857ec1a890cd05c5 (diff) | |
download | minetest-afb27329fc05076876c19e90f8c4343efa540207.tar.gz minetest-afb27329fc05076876c19e90f8c4343efa540207.tar.bz2 minetest-afb27329fc05076876c19e90f8c4343efa540207.zip |
Remove mapgen_air alias (#935)
-rw-r--r-- | games/minimal/mods/default/mapgen.lua | 1 | ||||
-rw-r--r-- | 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<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; } |