From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 4 Oct 2015 23:06:07 +0000 (+0100)
Subject: Flowers: Allow placing waterlily on river water
X-Git-Tag: 0.4.14~206
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8148bbf95e909fced58596f6e5a8d97a512f842e;p=oweals%2Fminetest_game.git

Flowers: Allow placing waterlily on river water

Add 'buildable_to = true' to flowers and waterlily
---

diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua
index c6ab0a26..e8899efd 100644
--- a/mods/flowers/init.lua
+++ b/mods/flowers/init.lua
@@ -46,6 +46,7 @@ local function add_simple_flower(name, desc, box, f_groups)
 		sunlight_propagates = true,
 		paramtype = "light",
 		walkable = false,
+		buildable_to = true,
 		stack_max = 99,
 		groups = f_groups,
 		sounds = default.node_sound_leaves_defaults(),
@@ -252,6 +253,7 @@ minetest.register_node("flowers:waterlily", {
 	wield_image = "flowers_waterlily.png",
 	liquids_pointable = true,
 	walkable = false,
+	buildable_to = true,
 	groups = {snappy = 3, flower = 1},
 	sounds = default.node_sound_leaves_defaults(),
 	node_box = {
@@ -266,10 +268,19 @@ minetest.register_node("flowers:waterlily", {
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		local find_water = minetest.find_nodes_in_area({x = pos.x - 1, y = pos.y, z = pos.z - 1},
 			{x = pos.x + 1, y = pos.y, z = pos.z + 1}, "default:water_source")
+		local find_river_water = minetest.find_nodes_in_area({x = pos.x - 1, y = pos.y, z = pos.z - 1},
+			{x = pos.x + 1, y = pos.y, z = pos.z + 1}, "default:river_water_source")
 		if #find_water ~= 0 then
 			minetest.set_node(pos, {name = "default:water_source"})
 			pos.y = pos.y + 1
+			minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
+		elseif #find_river_water ~= 0 then
+			minetest.set_node(pos, {name = "default:river_water_source"})
+			pos.y = pos.y + 1
+			minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
+		else
+			minetest.remove_node(pos)
+			return true
 		end
-		minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
 	end
 })