Mineclonia/mineclonia-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENTITIES/mcl_mobs: fix broken passive mob timer

Browse Source 
The timer has to be decremented by the full time elapsed since the last
call, but check_timer isn't called on every invocation of the globalstep
function and therefore misses time. Decrement it directly in the
globalstep function instead.

Previously check_timer seems to have assumed to be called with the
spawn_class as parameter (called mob_type, though), but actually it is
called on the spawn definition, leading to always returning true.
Instead retrieve spawn class from mob def found in registry.

The timer reset logic was reset even on non passive mobs, erronously
reducing the chance of spawning passive mobs. (Not noticable because
logic couldn't identify passive mobs correctly.)

Also PASSIVE_INTERVAL had been set to 200 instead of the 20 seconds
documented in the minecraft wiki. Change that, too.
This commit is contained in:
j-r 2023-12-01 17:14:56 +01:00 committed by ryvnf
parent 3f79549c3e
commit c20a7def3f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mods/ENTITIES/mcl_mobs/spawning.lua
View File

@ -10,7 +10,7 @@ local overworld_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_t
local overworld_sky_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_sky_threshold")) or 7
local overworld_passive_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_passive_threshold")) or 7
local PASSIVE_INTERVAL = 200
local PASSIVE_INTERVAL = 20
local dbg_spawn_attempts = 0
local dbg_spawn_succ = 0
local dbg_spawn_counts = {}
@ -384,11 +384,16 @@ end
local passive_timer = PASSIVE_INTERVAL
--timer function to check if passive mobs should spawn (every 20 secs)
local function check_timer(mob_type,dtime)
passive_timer = passive_timer - dtime
if mob_type == "passive" and passive_timer > 0 then return false end
if passive_timer < 0 then passive_timer = PASSIVE_INTERVAL end
--timer function to check if passive mobs should spawn (only every 20 secs unlike other mob spawn classes)
local function check_timer(spawn_def, dtime)
local mob_def = minetest.registered_entities[spawn_def.name]
if mob_def and mob_def.spawn_class == "passive" then
if passive_timer > 0 then
return false
else
passive_timer = PASSIVE_INTERVAL
end
end
return true
end
@ -463,6 +468,7 @@ if mobs_spawn then
local timer = 0
minetest.register_globalstep(function(dtime)
passive_timer = passive_timer - dtime
timer = timer + dtime
if timer < 10 then return end
timer = 0