From 1f17a8b1b27f59dcc67b717a0309aded1991c982 Mon Sep 17 00:00:00 2001
From: tenplus1 <tenplus1@users.noreply.github.com>
Date: Fri, 8 Jul 2016 15:41:37 +0100
Subject: [PATCH] merge upstream commit: Default/trees: Faster way to detect
snow around pine saplings
---
mods/default/trees.lua | 31 ++++---------------------------
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/mods/default/trees.lua b/mods/default/trees.lua
index 1b062660..1e0df1bc 100644
--- a/mods/default/trees.lua
+++ b/mods/default/trees.lua
@@ -27,33 +27,10 @@ end
-- 'is snow nearby' function
local function is_snow_nearby(pos)
- local x, y, z = pos.x, pos.y, pos.z
- local c_snow = minetest.get_content_id("default:snow")
- local c_snowblock = minetest.get_content_id("default:snowblock")
- local c_dirtsnow = minetest.get_content_id("default:dirt_with_snow")
-
- local vm = minetest.get_voxel_manip()
- local minp, maxp = vm:read_from_map(
- {x = x - 1, y = y - 1, z = z - 1},
- {x = x + 1, y = y + 1, z = z + 1}
- )
- local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
- local data = vm:get_data()
-
- for yy = y - 1, y + 1 do
- for zz = z - 1, z + 1 do
- local vi = a:index(x - 1, yy, zz)
- for xx = x - 1, x + 1 do
- local nodid = data[vi]
- if nodid == c_snow or nodid == c_snowblock or nodid == c_dirtsnow then
- return true
- end
- vi = vi + 1
- end
- end
- end
-
- return false
+ return #minetest.find_nodes_in_area(
+ {x = pos.x - 1, y = pos.y - 1, z = pos.z - 1},
+ {x = pos.x + 1, y = pos.y + 1, z = pos.z + 1},
+ {"default:snow", "default:snowblock", "default:dirt_with_snow"}) > 0
end
--
GitLab