From b39e322545d7a81ab2c10028a2e9f23d0be91993 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Tue, 3 Sep 2019 16:17:11 +0200
Subject: [PATCH] Remove village mapgen node

---
 mods/village/mapgen.lua                  |  20 ++------------------
 mods/village/textures/village_gen_mg.png | Bin 1910 -> 0 bytes
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 mods/village/textures/village_gen_mg.png

diff --git a/mods/village/mapgen.lua b/mods/village/mapgen.lua
index d2139ba..f8ac93a 100644
--- a/mods/village/mapgen.lua
+++ b/mods/village/mapgen.lua
@@ -47,24 +47,6 @@ minetest.register_node(
       end,
 })
 
--- TODO: Remove
-minetest.register_node(
-   "village:grassland_village_mg",
-   {
-      description = S("Legacy Mapgen Village Spawner"),
-      tiles = {"village_gen_mg.png"},
-      drawtype = "normal",
-      paramtype = "light",
-      sunlight_propagates = true,
-      walkable = false,
-      pointable = true,
-      diggable = true,
-      buildable_to = false,
-      is_ground_content = true,
-      drop = "",
-      groups = {not_in_craft_guide = 1, not_in_creative_inventory=1, dig_immediate = 2},
-})
-
 local function attempt_village_spawn(pos)
     local spos = table.copy(pos)
     spos.y = spos.y + 1
@@ -132,3 +114,5 @@ if not minetest.settings:get_bool("mapgen_disable_villages") then
    end
 end
 
+-- Legacy alias
+minetest.register_alias("village:grassland_village_mg", "air")
diff --git a/mods/village/textures/village_gen_mg.png b/mods/village/textures/village_gen_mg.png
deleted file mode 100644
index aff9d6b07a32f357f5f91070fc4ae0fe99a090f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1910
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