Fixes to deployer

diff --git a/technic/deployer.lua b/technic/deployer.lua
index aa5133b7d37e6018873f06bdfd75f618aadacf87..9fbef07e0079731975e8d6984dfe09d2d788399e 100644 (file)
--- a/technic/deployer.lua
+++ b/technic/deployer.lua
@@ -19,20 +19,23 @@ deployer_signal_on = function(pos, node)
        if node.param2==0 then pos1.z=pos1.z-1 end
 
        if node.name == "technic:deployer_off" then
-               hacky_swap_node(pos,"technic:deployer_on")
-               nodeupdate(pos)
-               local meta = minetest.env:get_meta(pos);
-               local inv = meta:get_inventory()
-               local i=0
-               for _,stack in ipairs(inv:get_list("main")) do
-               i=i+1
-               if stack:get_name() ~=nil then 
-                       node1={name=stack:get_name(), param1=0, param2=node.param2}
-                       minetest.env:place_node(pos1,node1)
-                       stack:take_item(1);
-                       inv:set_stack("main", i, stack)
-                       return
+               local node1=minetest.env:get_node(pos1)
+               if node1.name == "air" then 
+                       hacky_swap_node(pos,"technic:deployer_on")
+                       nodeupdate(pos)
+                       local meta = minetest.env:get_meta(pos);
+                       local inv = meta:get_inventory()
+                       local i=0
+                       for _,stack in ipairs(inv:get_list("main")) do
+                       i=i+1
+                       if stack:get_name() ~=nil and minetest.registered_nodes[stack:get_name()]~=nil then 
+                               node1={name=stack:get_name(), param1=0, param2=node.param2}
+                               minetest.env:place_node(pos1,node1)
+                               stack:take_item(1);
+                               inv:set_stack("main", i, stack)
+                               return
                        end
+               end
        end
        end
 end
@@ -93,8 +96,18 @@ minetest.register_node("technic:deployer_on", {
                        "technic_deployer_back.png","technic_deployer_front_on.png"},
        is_ground_content = true,
        paramtype2 = "facedir",
-       tubelike=1,
        groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, tubedevice_receiver=1,not_in_creative_inventory=1},
        mesecons = {effector={action_off=deployer_signal_off}},
+               tube={insert_object=function(pos,node,stack,direction)
+                       local meta=minetest.env:get_meta(pos)
+                       local inv=meta:get_inventory()
+                       return inv:add_item("main",stack)
+               end,
+               can_insert=function(pos,node,stack,direction)
+                       local meta=minetest.env:get_meta(pos)
+                       local inv=meta:get_inventory()
+                       return inv:room_for_item("main",stack)
+               end,
+               input_inventory="main"},
        sounds = default.node_sound_stone_defaults(),
 })