Revert "Fixed castle:straw warning "overwriting stair node" 🚨" (#742) f…

…ixes #741 This reverts commit 44143db.
lord-server · Aug 27, 2022 · b7dc1d4 · b7dc1d4
1 parent 1e80076
commit b7dc1d4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/mods/_various/castle/mod.conf b/mods/_various/castle/mod.conf
@@ -1,3 +1,3 @@
 name = castle
-depends = default, stairs, doors, lord_overwrites_mtg_farming, lottores, lottblocks, lottmapgen, lordlib
+depends = default, stairs, doors, farming, lottores, lottblocks, lottmapgen, lordlib
 optional_depends = building_blocks, asphalt, streets, moreblocks
diff --git a/mods/_various/castle/town_item.lua b/mods/_various/castle/town_item.lua
@@ -297,7 +297,9 @@ minetest.register_craft({
 	}
 })
 
-stairs.register_stair_and_slab("straw", "castle:straw",
+stairs.register_stair_and_slab(
+	"straw",
+	"castle:straw",
 	{choppy = 3, flammable = 1, oddly_breakable_by_hand = 3, grass = 1},
 	{"castle_straw.png"},
 	SL("Castle Straw Stair"),

diff --git a/mods/lord/_overwrites/MTG/farming/init.lua b/mods/lord/_overwrites/MTG/farming/init.lua
@@ -89,11 +89,3 @@ minetest.clear_craft({output = "farming:hoe_mese"})
 minetest.unregister_item("farming:hoe_mese")
 minetest.clear_craft({output = "farming:hoe_diamond"})
 minetest.unregister_item("farming:hoe_diamond")
-
--- Удаляем farming:straw (вместо него castle:straw)
-minetest.unregister_item("farming:straw")
-minetest.unregister_item("stairs:stair_straw")
-minetest.unregister_item("stairs:stair_inner_straw")
-minetest.unregister_item("stairs:stair_outer_straw")
-minetest.unregister_item("stairs:slab_straw")
-minetest.register_alias("farming:straw", "castle:straw") -- на всякий случай