fix mergeconflicts

mods/default/functions.lua

@@ -140,18 +140,17 @@ default.cool_lava = function(pos, node)
 		{pos = pos, max_hear_distance = 16, gain = 0.25})
 end
 
-minetest.register_abm({
-	label = "Lava cooling",
-	nodenames = {"default:lava_source", "default:lava_flowing"},
-	neighbors = {"group:cools_lava", "group:water"},
-	interval = 1,
-	chance = 2,
-	catch_up = false,
-	action = function(...)
-		default.cool_lava(...)
-	end,
-})
-
+if minetest.setting_getbool("enable_lavacooling") ~= false then
+	minetest.register_abm({
+		label = "Lava cooling",
+		nodenames = {"default:lava_source", "default:lava_flowing"},
+		neighbors = {"group:cools_lava", "group:water"},
+		interval = 1,
+		chance = 2,
+		catch_up = false,
+		action = default.cool_lava,
+	})
+end
 
 --
 -- optimized helper to put all items in an inventory into a drops list
@@ -232,9 +231,7 @@ minetest.register_abm({
 	neighbors = {"group:sand"},
 	interval = 12,
 	chance = 83,
-	action = function(...)
-		default.grow_cactus(...)
-	end
+	action = default.grow_cactus
 })
 
 minetest.register_abm({
@@ -243,9 +240,7 @@ minetest.register_abm({
 	neighbors = {"default:dirt", "default:dirt_with_grass"},
 	interval = 14,
 	chance = 71,
-	action = function(...)
-		default.grow_papyrus(...)
-	end
+	action = default.grow_papyrus
 })
 
 
@@ -328,8 +323,9 @@ local function leafdecay_after_destruct(pos, oldnode, def)
 	for _, v in pairs(minetest.find_nodes_in_area(vector.subtract(pos, def.radius),
 			vector.add(pos, def.radius), def.leaves)) do
 		local node = minetest.get_node(v)
-		if node.param2 == 0 then
-			minetest.get_node_timer(v):start(math.random(20, 120) / 10)
+		local timer = minetest.get_node_timer(v)
+		if node.param2 == 0 and not timer:is_started() then
+			timer:start(math.random(20, 120) / 10)
 		end
 	end
 end
@@ -552,9 +548,9 @@ function default.can_interact_with_node(player, pos)
 	end
 
 	local meta = minetest.get_meta(pos)
+	local owner = meta:get_string("owner")
 
-	if player:get_player_name() == meta:get_string("owner") then
-		-- Owner can access the node to any time
+	if not owner or owner == "" or owner == player:get_player_name() then
 		return true
 	end
 
@@ -564,7 +560,12 @@ function default.can_interact_with_node(player, pos)
 		local key_meta = item:get_meta()
 
 		if key_meta:get_string("secret") == "" then
-			key_meta:set_string("secret", minetest.parse_json(item:get_metadata()).secret)
+			local key_oldmeta = item:get_metadata()
+			if key_oldmeta == "" or not minetest.parse_json(key_oldmeta) then
+				return false
+			end
+
+			key_meta:set_string("secret", minetest.parse_json(key_oldmeta).secret)
 			item:set_metadata("")
 		end