From e935136d58dc863541a6a53c6f5e9f9d218e6661 Mon Sep 17 00:00:00 2001
From: orwell96 <orwell@bleipb.de>
Date: Thu, 4 Feb 2021 12:35:24 +0100
Subject: Make is_node_loaded() checks also for mesecon interactions and
 digiline_send(), move on_updated_from_nodedb to advtrains table

---
 advtrains/nodedb.lua                      |  9 +++++----
 advtrains/p_mesecon_iface.lua             | 20 ++++++++++++--------
 advtrains_luaautomation/active_common.lua |  4 +++-
 advtrains_train_track/init.lua            | 14 ++++++++++++--
 4 files changed, 32 insertions(+), 15 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,
 	},
 })
diff --git a/advtrains_luaautomation/active_common.lua b/advtrains_luaautomation/active_common.lua
index 2146c93..7db3eaf 100644
--- a/advtrains_luaautomation/active_common.lua
+++ b/advtrains_luaautomation/active_common.lua
@@ -125,7 +125,9 @@ function ac.run_in_env(pos, evtdata, customfct_p)
 	if minetest.global_exists("digiline") then
 		customfct.digiline_send=function(channel, msg)
 			assertt(channel, "string")
-			digiline:receptor_send(pos, digiline.rules.default, channel, msg)
+			if advtrains.is_node_loaded(pos) then
+				digiline:receptor_send(pos, digiline.rules.default, channel, msg)
+			end
 		end
 	end
 	-- add lines scheduler if enabled
diff --git a/advtrains_train_track/init.lua b/advtrains_train_track/init.lua
index 227bf02..7f1f73c 100644
--- a/advtrains_train_track/init.lua
+++ b/advtrains_train_track/init.lua
@@ -318,9 +318,14 @@ if mesecon then
 					}
 				},
 				advtrains = {
+					on_updated_from_nodedb = function(pos, node)
+						mesecon.receptor_off(pos, advtrains.meseconrules)
+					end,
 					on_train_enter=function(pos, train_id)
 						advtrains.ndb.swap_node(pos, {name="advtrains:dtrack_detector_on".."_"..suffix..rotation, param2=advtrains.ndb.get_node(pos).param2})
-						mesecon.receptor_on(pos, advtrains.meseconrules)
+						if advtrains.is_node_loaded(pos) then
+							mesecon.receptor_on(pos, advtrains.meseconrules)
+						end
 					end
 				}
 			}
@@ -343,9 +348,14 @@ if mesecon then
 					}
 				},
 				advtrains = {
+					on_updated_from_nodedb = function(pos, node)
+						mesecon.receptor_on(pos, advtrains.meseconrules)
+					end,
 					on_train_leave=function(pos, train_id)
 						advtrains.ndb.swap_node(pos, {name="advtrains:dtrack_detector_off".."_"..suffix..rotation, param2=advtrains.ndb.get_node(pos).param2})
-						mesecon.receptor_off(pos, advtrains.meseconrules)
+						if advtrains.is_node_loaded(pos) then
+							mesecon.receptor_off(pos, advtrains.meseconrules)
+						end
 					end
 				}
 			}
-- 
cgit v1.2.3