Use only red and white wool for beds

diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua
index 531b55d983daa31aa239c40d2215c703bba4b383..acff444c1f84f342bf3db7894be1cf19d82715fb 100644 (file)
--- a/mods/beds/beds.lua
+++ b/mods/beds/beds.lua
@@ -42,7 +42,7 @@ beds.register_bed("beds:fancy_bed", {
        },
        selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
        recipe = {
-               {"group:wool", "group:wool", "group:stick"},
+               {"wool:red", "wool:white", "group:stick"},
                {"group:wood", "group:wood", "group:wood"},
        },
 })
@@ -76,7 +76,7 @@ beds.register_bed("beds:bed", {
        },
        selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
        recipe = {
-               {"group:wool", "group:wool", "group:wool"},
+               {"wool:red", "wool:red", "wool:white"},
                {"group:wood", "group:wood", "group:wood"}
        },
 
@@ -84,21 +84,4 @@ beds.register_bed("beds:bed", {
 
 -- aliases for PA's beds mod
 minetest.register_alias("beds:bed_bottom_red", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_orange", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_yellow", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_green", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_blue", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_violet", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_black", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_grey", "beds:bed_bottom")
-minetest.register_alias("beds:bed_bottom_white", "beds:bed_bottom")
-
 minetest.register_alias("beds:bed_top_red", "beds:bed_top")
-minetest.register_alias("beds:bed_top_orange", "beds:bed_top")
-minetest.register_alias("beds:bed_top_yellow", "beds:bed_top")
-minetest.register_alias("beds:bed_top_green", "beds:bed_top")
-minetest.register_alias("beds:bed_top_blue", "beds:bed_top")
-minetest.register_alias("beds:bed_top_violet", "beds:bed_top")
-minetest.register_alias("beds:bed_top_black", "beds:bed_top")
-minetest.register_alias("beds:bed_top_grey", "beds:bed_top")
-minetest.register_alias("beds:bed_top_white", "beds:bed_top")

diff --git a/mods/beds/spawns.lua b/mods/beds/spawns.lua
index 5fcf1b93a5c378585e73f848e765dc555d4652f0..39da21c2eced1e4b7b377396946e4e919cd61fa9 100644 (file)
--- a/mods/beds/spawns.lua
+++ b/mods/beds/spawns.lua
@@ -16,14 +16,14 @@ function beds.read_spawns()
        local input = io.open(file, "r")
        if input and not bkwd then
                repeat
-               local x = input:read("*n")
-               if x == nil then
-                       break
-               end
-               local y = input:read("*n")
-               local z = input:read("*n")
-               local name = input:read("*l")
-               spawns[name:sub(2)] = {x = x, y = y, z = z}
+                       local x = input:read("*n")
+                       if x == nil then
+                               break
+                       end
+                       local y = input:read("*n")
+                       local z = input:read("*n")
+                       local name = input:read("*l")
+                       spawns[name:sub(2)] = {x = x, y = y, z = z}
                until input:read(0) == nil
                io.close(input)
        elseif input and bkwd then