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

Fix structure spawns under water + peaceful spawns (#4607)

Browse source 
- peaceful structure spawns would not run in peaceful mode (e.g., parrots)
- water structure spawns (e.g., guardians) would not run because the code required air above
- small code improvements

Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4607
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: kno10 <erich.schubert@gmail.com>
Co-committed-by: kno10 <erich.schubert@gmail.com>
This commit is contained in:
kno10 2024-09-15 23:15:30 +02:00 committed by the-real-herowl
parent 66b7a52d47
commit f219e5f4ae
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mods/MAPGEN/mcl_structures/api.lua
View file

@ -229,14 +229,14 @@ function mcl_structures.spawn_mobs(mob,spawnon,p1,p2,pr,n,water)
sp = minetest.find_nodes_in_area_under_air(p1,p2,spawnon) sp = minetest.find_nodes_in_area_under_air(p1,p2,spawnon)
end end
table.shuffle(sp) table.shuffle(sp)
for i,node in pairs(sp) do local count = 0
if not peaceful and i <= n then local mob_def = minetest.registered_entities[mob]
local pos = vector.offset(node,0,1,0) local enabled = (not peaceful) or (mob_def and mob_def.spawn_class ~= "hostile")
if pos then for _,node in pairs(sp) do
minetest.add_entity(pos,mob) if enabled and count < n and minetest.add_entity(vector.offset(node, 0, 1, 0), mob) then
end count = count + 1
end end
minetest.get_meta(node):set_string("spawnblock","yes") minetest.get_meta(node):set_string("spawnblock", "yes") -- note: also in peaceful mode!
end end
end end
@ -371,7 +371,12 @@ function mcl_structures.register_structure_spawn(def)
if active_object_count_wider > limit + mob_cap_animal then return end if active_object_count_wider > limit + mob_cap_animal then return end
if active_object_count_wider > mob_cap_player then return end if active_object_count_wider > mob_cap_player then return end
local p = vector.offset(pos,0,1,0) local p = vector.offset(pos,0,1,0)
if minetest.get_node(p).name ~= "air" then return end local pname = minetest.get_node(p).name
if def.type_of_spawning == "water" then
if pname ~= "mcl_core:water_source" and pname ~= "mclx_core:river_water_source" then return end
else
if pname ~= "air" then return end
end
if minetest.get_meta(pos):get_string("spawnblock") == "" then return end if minetest.get_meta(pos):get_string("spawnblock") == "" then return end
if mg_name ~= "v6" and mg_name ~= "singlenode" and def.biomes then if mg_name ~= "v6" and mg_name ~= "singlenode" and def.biomes then
if table.indexof(def.biomes,minetest.get_biome_name(minetest.get_biome_data(p).biome)) == -1 then if table.indexof(def.biomes,minetest.get_biome_name(minetest.get_biome_data(p).biome)) == -1 then