From: paramat <mat.gregory@virginmedia.com>
Date: Mon, 5 Oct 2015 00:25:23 +0000 (+0100)
Subject: Papyrus: Grow on dirt and grass only, remove from desert ocean
X-Git-Tag: 0.4.14~205
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f4a412d9c1bb7f6d297bb6e215e064a254f7f6ed;p=oweals%2Fminetest_game.git

Papyrus: Grow on dirt and grass only, remove from desert ocean
---

diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index 3accbd1f..50f481f6 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -152,8 +152,7 @@ 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" and
-			name ~= "default:sand" then
+	if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
 		return
 	end
 	if not minetest.find_node_near(pos, 3, {"group:water"}) then
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index cb9fbe78..0a2b3bc2 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -1054,7 +1054,7 @@ function default.register_decorations()
 
 	minetest.register_decoration({
 		deco_type = "schematic",
-		place_on = {"default:dirt", "default:sand"},
+		place_on = {"default:dirt"},
 		sidelen = 16,
 		noise_params = {
 			offset = -0.3,
@@ -1064,7 +1064,7 @@ function default.register_decorations()
 			octaves = 3,
 			persist = 0.7
 		},
-		biomes = {"savanna_swamp", "desert_ocean"},
+		biomes = {"savanna_swamp"},
 		y_min = 0,
 		y_max = 0,
 		schematic = minetest.get_modpath("default").."/schematics/papyrus.mts",