Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-22 18:41:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix https://git.minetest.land/MineClone2/MineClone2/issues/1052 (stop searching trees after 10+ attempts)

Browse source
This commit is contained in:
kay27 2021-02-04 03:41:43 +04:00
parent 9492f276fc
commit 13a9dbed3e
1 changed files with 64 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
mods/PLAYER/mcl_spawn/init.lua
View file

@ -45,6 +45,8 @@ local start_pos = minetest.setting_get_pos("static_spawnpoint") or {x = 0, y = 8
-- Table of suitable biomes -- Table of suitable biomes
local biome_ids = {} local biome_ids = {}
local no_trees_area_counter = 0
-- Bed spawning offsets -- Bed spawning offsets
local node_search_list = local node_search_list =
{ {
@ -233,8 +235,22 @@ local function next_biome()
end end
end end
if #biome_ids < 1 then if #biome_ids < 1 then
minetest.log("warning", "[mcl_spawn] No suitable biomes found") next_pos()
return false if math.abs(cp.x) > spawn_limit or math.abs(cp.z) > spawn_limit then
check = checks + 1
minetest.log("warning", "[mcl_spawn] No white-listed biomes found - search stopped by overlimit")
return false
end
check = check + 1
cp.y = minetest.get_spawn_level(cp.x, cp.z) or start_pos.y
if cp.y then
wsp = {x = cp.x, y = cp.y, z = cp.z}
minetest.log("warning", "[mcl_spawn] No white-listed biomes found - using current")
return true
else
minetest.log("warning", "[mcl_spawn] No white-listed biomes found and spawn level is nil - please define start_pos to continue")
return false
end
end end
minetest.log("action", "[mcl_spawn] Suitable biomes found: "..tostring(#biome_ids)) minetest.log("action", "[mcl_spawn] Suitable biomes found: "..tostring(#biome_ids))
end end
@ -277,16 +293,56 @@ local function ecb_search_continue(blockpos, action, calls_remaining, param)
local nodes = minetest.find_nodes_in_area_under_air(emerge_pos1, emerge_pos2, node_groups_white_list) local nodes = minetest.find_nodes_in_area_under_air(emerge_pos1, emerge_pos2, node_groups_white_list)
minetest.log("verbose", "[mcl_spawn] Data emerge callback: "..minetest.pos_to_string(wsp).." - "..tostring(nodes and #nodes) .. " node(s) found under air") minetest.log("verbose", "[mcl_spawn] Data emerge callback: "..minetest.pos_to_string(wsp).." - "..tostring(nodes and #nodes) .. " node(s) found under air")
if nodes then if nodes then
local trees = get_trees(emerge_pos1, emerge_pos2) if no_trees_area_counter >= 0 then
if trees then local trees = get_trees(emerge_pos1, emerge_pos2)
if trees and #trees > 0 then
no_trees_area_counter = 0
if attempts_to_find_pos * 3 < #nodes then
-- random
for i=1, attempts_to_find_pos do
wsp = nodes[math.random(1,#nodes)]
if wsp then
wsp.y = wsp.y + 1
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then
minetest.log("action", "[mcl_spawn] Dynamic world spawn randomly determined to be "..minetest.pos_to_string(wsp))
searched = true
success = true
return
end
end
end
else
-- in a sequence
for i=1, math.min(#nodes, attempts_to_find_pos) do
wsp = nodes[i]
if wsp then
wsp.y = wsp.y + 1
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then
minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp))
searched = true
success = true
return
end
end
end
end
else
no_trees_area_counter = no_trees_area_counter + 1
if no_trees_area_counter > 10 then
minetest.log("verbose", "[mcl_spawn] More than 10 times no trees at all! Won't search trees next 200 calls")
no_trees_area_counter = -200
end
end
else -- seems there are no trees but we'll check it later, after next 200 calls
no_trees_area_counter = no_trees_area_counter + 1
if attempts_to_find_pos * 3 < #nodes then if attempts_to_find_pos * 3 < #nodes then
-- random -- random
for i=1, attempts_to_find_pos do for i=1, attempts_to_find_pos do
wsp = nodes[math.random(1,#nodes)] wsp = nodes[math.random(1,#nodes)]
if wsp then if wsp then
wsp.y = wsp.y + 1 wsp.y = wsp.y + 1
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then if good_for_respawn(wsp) then
minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp)) minetest.log("action", "[mcl_spawn] Dynamic world spawn randomly determined to be "..minetest.pos_to_string(wsp) .. " (no trees)")
searched = true searched = true
success = true success = true
return return
@ -299,8 +355,8 @@ local function ecb_search_continue(blockpos, action, calls_remaining, param)
wsp = nodes[i] wsp = nodes[i]
if wsp then if wsp then
wsp.y = wsp.y + 1 wsp.y = wsp.y + 1
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then if good_for_respawn(wsp) then
minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp)) minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp) .. " (no trees)")
searched = true searched = true
success = true success = true
return return