From 2cf6332b57452b762d3d34b33c4d0b6914388b00 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 17 Jan 2018 03:05:12 +0100 Subject: [PATCH] Conductors no longer power themselves --- mods/ITEMS/REDSTONE/mesecons/internal.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/REDSTONE/mesecons/internal.lua b/mods/ITEMS/REDSTONE/mesecons/internal.lua index 89c8426b7e..dae3c17137 100644 --- a/mods/ITEMS/REDSTONE/mesecons/internal.lua +++ b/mods/ITEMS/REDSTONE/mesecons/internal.lua @@ -516,7 +516,7 @@ function mesecon.rules_link_rule_all_inverted(input, rule) return rules end -function mesecon.is_powered(pos, rule, depth, sourcepos) +function mesecon.is_powered(pos, rule, depth, sourcepos, home_pos) if depth == nil then depth = 0 end if depth > 1 then return false @@ -526,6 +526,9 @@ function mesecon.is_powered(pos, rule, depth, sourcepos) if not rules then return false end + if not home_pos then + home_pos = pos + end -- List of nodes that send out power to pos if sourcepos == nil then @@ -538,9 +541,11 @@ function mesecon.is_powered(pos, rule, depth, sourcepos) local nn = mesecon.get_node_force(np) if (mesecon.is_conductor_on (nn, mesecon.invertRule(rname)) or mesecon.is_receptor_on (nn.name)) then - table.insert(sourcepos, np) + if not vector.equals(home_pos, np) then + table.insert(sourcepos, np) + end elseif depth == 0 and minetest.get_item_group(nn.name, "opaque") == 1 then - local more_sourcepos = mesecon.is_powered(np, nil, depth + 1, sourcepos) + local more_sourcepos = mesecon.is_powered(np, nil, depth + 1, sourcepos, home_pos) mesecon.mergetable(sourcepos, more_sourcepos) end end