[mesecons] Update; fix #446

mods/mesecons/COPYING.txt

@@ -0,0 +1,30 @@
+The Mesecons Mod for Minetest is
+	Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+See the version control system log for information about other authors.
+
+License of source code
+----------------------
+Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+This program is free software; you can redistribute the Mesecons Mod and/or
+modify it under the terms of the GNU Lesser General Public License version 3
+published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+
+License of media (textures, sounds and documentation)
+-----------------------------------------------------
+Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+All textures, sounds and documentation files are licensed under the
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+http://creativecommons.org/licenses/by-sa/3.0/

mods/mesecons/mesecons_commandblock/init.lua

@@ -43,9 +43,9 @@ minetest.register_chatcommand("hp", {
 })
 
 local function initialize_data(meta)
-	local commands = meta:get_string("commands")
+	local commands = minetest.formspec_escape(meta:get_string("commands"))
 	meta:set_string("formspec",
-		"size[9,5;]" ..
+		"invsize[9,5;]" ..
 		"textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..
 		"label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" ..
 		"button_exit[3.3,4.5;2,1;submit;Submit]")

mods/mesecons/mesecons_detector/init.lua

@@ -13,8 +13,8 @@ local object_detector_make_formspec = function (pos)
 		"button_exit[7,0.75;2,3;;Save]")
 end
 
-local object_detector_on_receive_fields = function(pos, formname, fields)
+local function object_detector_on_receive_fields(pos, _, fields)
-	if not fields.scanname or not fields.digiline_channel then return end;
+	if not fields.scanname or not fields.digiline_channel then return end
 
 	local meta = minetest.get_meta(pos)
 	meta:set_string("scanname", fields.scanname)
@@ -23,7 +23,7 @@ local object_detector_on_receive_fields = function(pos, formname, fields)
 end
 
 -- returns true if player was found, false if not
-local object_detector_scan = function (pos)
+local function object_detector_scan(pos)
 	local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6))
 	for k, obj in pairs(objs) do
 		local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!

mods/mesecons/mesecons_extrawires/mesewire.lua

@@ -16,15 +16,21 @@ minetest.override_item("default:mese", {
 	}}
 })
 
-minetest.register_node("mesecons_extrawires:mese_powered", {
+-- Copy node definition of powered mese from normal mese
-	tiles = {minetest.registered_nodes["default:mese"].tiles[1].."^[brighten"},
+-- and brighten texture tiles to indicate mese is powered
-	is_ground_content = true,
+local powered_def = mesecon.mergetable(minetest.registered_nodes["default:mese"], {
-	groups = {cracky=1, not_in_creative_inventory = 1},
+	drop = "default:mese",
-	sounds = default.node_sound_stone_defaults(),
+	light_source = 5,
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "default:mese",
 		rules = mesewire_rules
 	}},
-	drop = "default:mese"
+	groups = {cracky = 1, not_in_creative_inventory = 1}
 })
+
+for i, v in pairs(powered_def.tiles) do
+	powered_def.tiles[i] = v .. "^[brighten"
+end
+
+minetest.register_node("mesecons_extrawires:mese_powered", powered_def)

mods/mesecons/mesecons_luacontroller/init.lua

@@ -229,23 +229,35 @@ end
 
 local function remove_functions(x)
 	local tp = type(x)
-	if tp == "table" then
+	if tp == "function" then
-		for key, value in pairs(x) do
-			local key_t, val_t = type(key), type(value)
-			if key_t == "function" or val_t == "function" then
-				x[key] = nil
-			else
-				if key_t == "table" then
-					remove_functions(key)
-				end
-				if val_t == "table" then
-					remove_functions(value)
-				end
-			end
-		end
-	elseif tp == "function" then
 		return nil
 	end
+
+	-- Make sure to not serialize the same table multiple times, otherwise
+	-- writing mem.test = mem in the LuaController will lead to infinite recursion
+	local seen = {}
+
+	local function rfuncs(x)
+		if seen[x] then return end
+		seen[x] = true
+		if type(x) ~= "table" then return end
+
+		for key, value in pairs(x) do
+			if type(key) == "function" or type(value) == "function" then
+				x[key] = nil
+			else
+				if type(key) == "table" then
+					rfuncs(key)
+				end
+				if type(value) == "table" then
+					rfuncs(value)
+				end
+			end
+		end
+	end
+
+	rfuncs(x)
+
 	return x
 end