From dcf1f799c59b2b777c88a9127d0e8d358be0e7cd Mon Sep 17 00:00:00 2001 From: Jeija Date: Fri, 21 Nov 2014 21:43:28 +0100 Subject: [PATCH] Fix #184, Fix #186, Fix #187 Just some minor issues like dead code. --- mesecons/actionqueue.lua | 3 ++- mesecons_luacontroller/init.lua | 1 - mesecons_pistons/init.lua | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mesecons/actionqueue.lua b/mesecons/actionqueue.lua index a5daf88..e0b8c65 100644 --- a/mesecons/actionqueue.lua +++ b/mesecons/actionqueue.lua @@ -44,7 +44,8 @@ end -- However, even that does not work in some cases, that's why we delay the time the globalsteps -- start to be execute by 5 seconds local get_highest_priority = function (actions) - local highestp = -1, highesti + local highestp = -1 + local highesti for i, ac in ipairs(actions) do if ac.priority > highestp then highestp = ac.priority diff --git a/mesecons_luacontroller/init.lua b/mesecons_luacontroller/init.lua index f4869b5..6fb5d03 100644 --- a/mesecons_luacontroller/init.lua +++ b/mesecons_luacontroller/init.lua @@ -477,7 +477,6 @@ minetest.register_node(nodename, { reset_meta(pos, fields.code, err) end end, - on_timer = handle_timer, sounds = default.node_sound_stone_defaults(), mesecons = mesecons, digiline = digiline, diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index 7780fc9..efc18f3 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -56,14 +56,15 @@ end local piston_remove_pusher = function(pos, node) pistonspec = minetest.registered_nodes[node.name].mesecons_piston - if pushername == pistonspec.pusher then --make sure there actually is a pusher (for compatibility reasons mainly) - return - end - dir = piston_get_direction(pistonspec.dir, node) local pusherpos = mesecon:addPosRule(pos, dir) local pushername = minetest.get_node(pusherpos).name + -- make sure there actually is a pusher (for compatibility reasons mainly) + if pushername ~= pistonspec.pusher then + return + end + minetest.remove_node(pusherpos) minetest.sound_play("piston_retract", { pos = pos,