Merge nocrash branch into master and merging it with the unified functions so that restoring works how it should

Also fix minor bugs and an occasional crash with couples

1 files changed, 15 insertions, 17 deletions

diff --git a/advtrains/advtrains_luaautomation/interrupt.lua b/advtrains/advtrains_luaautomation/interrupt.lua
index fa340b8..718b8c7 100644
--- a/advtrains/advtrains_luaautomation/interrupt.lua
+++ b/advtrains/advtrains_luaautomation/interrupt.lua
@@ -22,26 +22,24 @@ function iq.add(t, pos, evtdata)
 end
 
 function iq.mainloop(dtime)
-	if run then
-		timer=timer + math.min(dtime, 0.2)
-		for i=1,#queue do
-			local qe=queue[i]
-			if not qe then
-				table.remove(queue, i)
-				i=i-1
-			elseif timer>qe.t then
-				local pos, evtdata=queue[i].p, queue[i].e
-				local node=advtrains.ndb.get_node(pos)
-				local ndef=minetest.registered_nodes[node.name]
-				if ndef and ndef.luaautomation and ndef.luaautomation.fire_event then
-					ndef.luaautomation.fire_event(pos, evtdata)
-				end
-				table.remove(queue, i)
-				i=i-1
+	timer=timer + math.min(dtime, 0.2)
+	for i=1,#queue do
+		local qe=queue[i]
+		if not qe then
+			table.remove(queue, i)
+			i=i-1
+		elseif timer>qe.t then
+			local pos, evtdata=queue[i].p, queue[i].e
+			local node=advtrains.ndb.get_node(pos)
+			local ndef=minetest.registered_nodes[node.name]
+			if ndef and ndef.luaautomation and ndef.luaautomation.fire_event then
+				ndef.luaautomation.fire_event(pos, evtdata)
 			end
+			table.remove(queue, i)
+			i=i-1
 		end
 	end
-end)
+end