diff options
Diffstat (limited to 'advtrains')
| -rw-r--r-- | advtrains/nodedb.lua | 9 | ||||
| -rw-r--r-- | advtrains/p_mesecon_iface.lua | 20 |
2 files changed, 17 insertions, 12 deletions
diff --git a/advtrains/nodedb.lua b/advtrains/nodedb.lua index bdde44a..878ed88 100644 --- a/advtrains/nodedb.lua +++ b/advtrains/nodedb.lua @@ -294,11 +294,12 @@ ndb.run_lbm = function(pos, node) ndb.update(pos, node) else if (nodeid~=node.name or param2~=node.param2) then - atprint("nodedb: lbm replaced", pos, "with nodeid", nodeid, "param2", param2, "cid is", cid) - minetest.swap_node(pos, {name=nodeid, param2 = param2}) + --atprint("nodedb: lbm replaced", pos, "with nodeid", nodeid, "param2", param2, "cid is", cid) + local newnode = {name=nodeid, param2 = param2} + minetest.swap_node(pos, newnode) local ndef=minetest.registered_nodes[nodeid] - if ndef and ndef.on_updated_from_nodedb then - ndef.on_updated_from_nodedb(pos, node) + if ndef and ndef.advtrains and ndef.advtrains.on_updated_from_nodedb then + ndef.advtrains.on_updated_from_nodedb(pos, newnode) end return true end diff --git a/advtrains/p_mesecon_iface.lua b/advtrains/p_mesecon_iface.lua index 177112e..0eef96a 100644 --- a/advtrains/p_mesecon_iface.lua +++ b/advtrains/p_mesecon_iface.lua @@ -13,17 +13,19 @@ minetest.override_item("mesecons_switch:mesecon_switch_off", { mesecon.receptor_on(pos) minetest.sound_play("mesecons_switch", {pos=pos}) end, - on_updated_from_nodedb = function(pos, node) - mesecon.receptor_off(pos) - end, advtrains = { getstate = "off", setstate = function(pos, node, newstate) if newstate=="on" then advtrains.ndb.swap_node(pos, {name="mesecons_switch:mesecon_switch_on", param2=node.param2}) - mesecon.receptor_on(pos) + if advtrains.is_node_loaded(pos) then + mesecon.receptor_on(pos) + end end end, + on_updated_from_nodedb = function(pos, node) + mesecon.receptor_off(pos) + end, }, }) @@ -38,17 +40,19 @@ minetest.override_item("mesecons_switch:mesecon_switch_on", { mesecon.receptor_off(pos) minetest.sound_play("mesecons_switch", {pos=pos}) end, - on_updated_from_nodedb = function(pos, node) - mesecon.receptor_on(pos) - end, advtrains = { getstate = "on", setstate = function(pos, node, newstate) if newstate=="off" then advtrains.ndb.swap_node(pos, {name="mesecons_switch:mesecon_switch_off", param2=node.param2}) - mesecon.receptor_off(pos) + if advtrains.is_node_loaded(pos) then + mesecon.receptor_off(pos) + end end end, fallback_state = "off", + on_updated_from_nodedb = function(pos, node) + mesecon.receptor_on(pos) + end, }, }) |