From 87621caf1f684e66e5b7768859260c7aff66dc6b Mon Sep 17 00:00:00 2001 From: orwell96 Date: Wed, 17 Oct 2018 17:42:32 +0200 Subject: Fix H#66 (Hemiptera 66) crash on missing double_conn match --- advtrains/trackplacer.lua | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'advtrains/trackplacer.lua') diff --git a/advtrains/trackplacer.lua b/advtrains/trackplacer.lua index ffae736..258c9cd 100644 --- a/advtrains/trackplacer.lua +++ b/advtrains/trackplacer.lua @@ -207,15 +207,18 @@ function tp.placetrack(pos, nnpref, placer, itemstack, pointed_thing, yaw) if (dconn1[conn1.."_"..conn2]) then using = dconn1[conn1.."_"..conn2] end - - tp.bend_rail(p_railpos[conn1], conn1, nnpref) - tp.bend_rail(p_railpos[conn2], conn2, nnpref) - advtrains.ndb.swap_node(pos, using) - local nname=using.name - if minetest.registered_nodes[nname] and minetest.registered_nodes[nname].after_place_node then - minetest.registered_nodes[nname].after_place_node(pos, placer, itemstack, pointed_thing) + if using then + -- has found a fitting rail in either direction + -- if not, continue loop + tp.bend_rail(p_railpos[conn1], conn1, nnpref) + tp.bend_rail(p_railpos[conn2], conn2, nnpref) + advtrains.ndb.swap_node(pos, using) + local nname=using.name + if minetest.registered_nodes[nname] and minetest.registered_nodes[nname].after_place_node then + minetest.registered_nodes[nname].after_place_node(pos, placer, itemstack, pointed_thing) + end + return end - return end end end -- cgit v1.2.3