From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 22 Mar 2017 17:51:29 +0000 (+0000)
Subject: Flora spread: Do not replace flora with dry shrub, only 'return'
X-Git-Tag: 0.4.16~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=91182d6a9ec56c88096c1bad653a85426892c54d;p=oweals%2Fminetest_game.git

Flora spread: Do not replace flora with dry shrub, only 'return'

If there is no group:soil node found below, do not replace flora with
dry shrub, this was breaking flower pots and other mods.
Originally, flora would only turn to dry shrub if in desert sand.
---

diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua
index c71bc29c..f5955d8c 100644
--- a/mods/flowers/init.lua
+++ b/mods/flowers/init.lua
@@ -107,10 +107,9 @@ function flowers.flower_spread(pos, node)
 	pos.y = pos.y - 1
 	local under = minetest.get_node(pos)
 	pos.y = pos.y + 1
-	if minetest.get_item_group(under.name, "soil") == 0 and
-			-- Do not replace sand dune grasses
-			under.name ~= "default:sand" then
-		minetest.set_node(pos, {name = "default:dry_shrub"})
+	if minetest.get_item_group(under.name, "soil") == 0 then
+		-- Do not replace with dry shrub here as
+		-- this breaks flower pots and other mods.
 		return
 	end