From: Paramat <paramat@users.noreply.github.com>
Date: Sun, 21 Jun 2020 22:24:56 +0000 (+0100)
Subject: Update nodes papyrus can grow on, include default:dry_dirt (#2705)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2d0f0ac8d9cfaa2cd8343cc35aa2905bf9c711a;p=oweals%2Fminetest_game.git

Update nodes papyrus can grow on, include default:dry_dirt (#2705)

Fixes papyrus not growing on savanna dirt.
Also updates the nodes papyrus can grow on, which were incorrect for a long time.
---

diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index 16bdd798..3dd7a008 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -210,7 +210,12 @@ end
 function default.grow_papyrus(pos, node)
 	pos.y = pos.y - 1
 	local name = minetest.get_node(pos).name
-	if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
+	if name ~= "default:dirt" and
+			name ~= "default:dirt_with_grass" and
+			name ~= "default:dirt_with_dry_grass" and
+			name ~= "default:dirt_with_rainforest_litter" and
+			name ~= "default:dry_dirt" and
+			name ~= "default:dry_dirt_with_dry_grass" then
 		return
 	end
 	if not minetest.find_node_near(pos, 3, {"group:water"}) then
@@ -247,7 +252,17 @@ minetest.register_abm({
 minetest.register_abm({
 	label = "Grow papyrus",
 	nodenames = {"default:papyrus"},
-	neighbors = {"default:dirt", "default:dirt_with_grass"},
+	-- Grows on the dirt and surface dirt nodes of the biomes papyrus appears in,
+	-- including the old savanna nodes.
+	-- 'default:dirt_with_grass' is here only because it was allowed before.
+	neighbors = {
+		"default:dirt",
+		"default:dirt_with_grass",
+		"default:dirt_with_dry_grass",
+		"default:dirt_with_rainforest_litter",
+		"default:dry_dirt",
+		"default:dry_dirt_with_dry_grass",
+	},
 	interval = 14,
 	chance = 71,
 	action = function(...)