aboutsummaryrefslogtreecommitdiff
path: root/advtrains_interlocking
diff options
context:
space:
mode:
authorGabriel Pérez-Cerezo <gabriel@gpcf.eu>2019-10-21 16:39:54 +0200
committerGabriel Pérez-Cerezo <gabriel@gpcf.eu>2019-10-21 16:39:54 +0200
commit74f7233d216da5a37a36fd54be4d8d6a4a278c8b (patch)
treea39a293363c307dad828911bf92788ac572db958 /advtrains_interlocking
parent7977776b4a8067ea513d95ab2b0d699456596209 (diff)
parent27f85f2e225e038789036fac4407d97aacb2189b (diff)
downloadadvtrains-74f7233d216da5a37a36fd54be4d8d6a4a278c8b.tar.gz
advtrains-74f7233d216da5a37a36fd54be4d8d6a4a278c8b.tar.bz2
advtrains-74f7233d216da5a37a36fd54be4d8d6a4a278c8b.zip
Merge branch 'master' of https://git.bananach.space/advtrains
Diffstat (limited to 'advtrains_interlocking')
-rw-r--r--advtrains_interlocking/database.lua3
-rw-r--r--advtrains_interlocking/tcb_ts_ui.lua2
2 files changed, 3 insertions, 2 deletions
diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 7571a2c..8df874f 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -336,7 +336,8 @@ function ildb.sync_tcb_neighbors(pos, connid)
local found_tcbs = { {p = pos, s = connid} }
local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes)
if not node_ok then
- error("update_tcb_neighbors but node is NOK: "..minetest.pos_to_string(pos))
+ atwarn("update_tcb_neighbors but node is NOK: "..minetest.pos_to_string(pos))
+ return
end
--atdebug("Traversing from ",pos, connid)
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index dca50da..6c773ab 100644
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -85,7 +85,7 @@ minetest.register_node("advtrains_interlocking:tcb_node", {
local tcb = ildb.get_tcb(tcbpos)
if not tcb then return true end
for connid=1,2 do
- if tcb[connid].ts_id then
+ if tcb[connid].ts_id or tcb[connid].signal then
return false
end
end