Flowers: small fix and update

files/flowerpot/init.lua

@@ -59,20 +59,28 @@ local function flowerpot_on_rightclick(pos, _, clicker, itemstack)
 end
 
 local function get_tile(def)
-	local tile = def.tiles[1]
-	if type(tile) == "table" then
-		tile = tile.name
-	end
-
 	local tiles = {"flowerpot.png"}
-	if def.drawtype == "plantlike" then
+	local drawtype = def.drawtype
-		tiles[2] = tile
+
+	if drawtype == "mesh" then
+		tiles[2] = "[combine:64x64:0,10=" .. def.inventory_image
 		tiles[3] = "blank.png"
 	else
-		tiles[2] = "blank.png"
+		local tile = def.tiles[1]
-		tiles[3] = tile
+		if type(tile) == "table" then
+			tile = tile.name
+		end
+
+		if drawtype == "plantlike" then
+			tiles[2] = tile
+			tiles[3] = "blank.png"
+		else
+			tiles[2] = "blank.png"
+			tiles[3] = tile
+		end
 	end
 
+
 	return tiles
 end
 
@@ -149,7 +157,7 @@ inv.on_place = function(itemstack, placer, pointed_thing)
 		if result and not (creative and creative.is_enabled_for and
 				creative.is_enabled_for(placer)) then
 			itemstack:take_item()
-			minetest.sound_play({name = "default_place_node_hard", gain = 1},
+			minetest.sound_play({name = "default_place_node_hard"},
 					{pos = pointed_thing.above})
 		end
 	end
@@ -171,6 +179,6 @@ minetest.register_craft({
 local register_pot = flowerpot.register_node
 for node, def in pairs(minetest.registered_nodes) do
 	if def.groups.flora or def.groups.sapling then
-		flowerpot.register_node(node)
+		register_pot(node)
 	end
 end

files/flowers/init.lua

@@ -228,8 +228,8 @@ minetest.register_node("flowers:mushroom_brown", {
 
 function flowers.mushroom_spread(pos, node)
 	if minetest.get_node_light(pos, 0.5) > 3 then
-	if minetest.get_node_light(pos, nil) == 15 then
+		if minetest.get_node_light(pos, nil) == 15 then
-		minetest.remove_node(pos)
+			minetest.remove_node(pos)
 		end
 		return
 	end
@@ -250,8 +250,8 @@ end
 minetest.register_abm({
 	label = "Mushroom spread",
 	nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"},
-	interval = 20,
+	interval = 15,
-	chance = 100,
+	chance = 150,
 	action = function(...)
 		flowers.mushroom_spread(...)
 	end
@@ -300,7 +300,6 @@ minetest.register_node("flowers:waterlily", {
 		local pos = pointed_thing.above
 		local node = minetest.get_node(pointed_thing.under)
 		local def = minetest.registered_nodes[node.name]
-		local player_name = placer and placer:get_player_name() or ""
 
 		if def and def.on_rightclick then
 			return def.on_rightclick(pointed_thing.under, node, placer, itemstack,
@@ -309,6 +308,7 @@ minetest.register_node("flowers:waterlily", {
 
 		if def and def.liquidtype == "source" and
 				minetest.get_item_group(node.name, "water") > 0 then
+			local player_name = placer and placer:get_player_name() or ""
 			if not minetest.is_protected(pos, player_name) then
 				minetest.set_node(pos, {name = "flowers:waterlily",
 					param2 = math.random(0, 3)})