diff options
| author | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-03-04 23:58:38 -0500 |
|---|---|---|
| committer | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-03-04 23:58:38 -0500 |
| commit | a46f07cbfbd9ae59b7b1cc2fc32f68c39ae34de0 (patch) | |
| tree | 5358ecc88cd634e7277bf04e51be8e9ddd37b2aa /framedglass | |
| parent | 3eb0b959da58a153e4b9fc7f70eb513b1cf0e5fd (diff) | |
| download | dreambuilder_modpack-a46f07cbfbd9ae59b7b1cc2fc32f68c39ae34de0.tar dreambuilder_modpack-a46f07cbfbd9ae59b7b1cc2fc32f68c39ae34de0.tar.gz dreambuilder_modpack-a46f07cbfbd9ae59b7b1cc2fc32f68c39ae34de0.tar.bz2 dreambuilder_modpack-a46f07cbfbd9ae59b7b1cc2fc32f68c39ae34de0.tar.xz dreambuilder_modpack-a46f07cbfbd9ae59b7b1cc2fc32f68c39ae34de0.zip | |
updated digilines, framedglass, mesecons, pipeworks, quartz
technic, unifiedinventory, and unifiedbricks
Diffstat (limited to 'framedglass')
| -rw-r--r-- | framedglass/init.lua | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/framedglass/init.lua b/framedglass/init.lua index 90bd6c5..d42a07b 100644 --- a/framedglass/init.lua +++ b/framedglass/init.lua @@ -100,16 +100,8 @@ function framedglass.color_on_punch(pos, node, puncher, pointed_thing) local itemstack = puncher:get_wielded_item() local itemname = itemstack:get_name() - if not string.find(itemname, "dye:") then - if minetest.registered_nodes[node.name] then - local pos2 = select_node(pointed_thing) - if pos2 and is_buildable_to(puncher, pos2) then - minetest.set_node(pos2, { name = itemname }) - if not creative_mode then - itemstack:take_item() - end - end - end + if not string.find(itemname, "dye:") + and not string.find(itemname, "unifieddyes:") then return itemstack end @@ -138,8 +130,6 @@ function framedglass.color_on_punch(pos, node, puncher, pointed_thing) local inv = puncher:get_inventory() local prevdye = "dye:"..oldcolor2 - print(oldcolor, oldcolor2, newcolor, newcolor2, prevdye) - if not (inv:contains_item("main", prevdye) and creative_mode) and minetest.registered_items[prevdye] then if inv:room_for_item("main", prevdye) then inv:add_item("main", prevdye) |