grorp
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fix two more crashes, stray space

This commit is contained in:
teknomunk 2024-06-14 19:49:45 -05:00 committed by the-real-herowl
parent 304550d90c
commit 3928e12634
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -149,12 +149,12 @@ function mob_class:mob_activate(staticdata, def, dtime)
local tmp = minetest.deserialize(staticdata) local tmp = minetest.deserialize(staticdata)
if tmp then
-- Patch incorrectly converted mobs -- Patch incorrectly converted mobs
if tmp.base_mesh ~= minetest.registered_entities[self.name].mesh then if tmp.base_mesh ~= minetest.registered_entities[self.name].mesh then
mcl_mobs.strip_staticdata(tmp) mcl_mobs.strip_staticdata(tmp)
end end
if tmp then
for _,stat in pairs(tmp) do for _,stat in pairs(tmp) do
self[_] = stat self[_] = stat
end end

7
mods/ENTITIES/mcl_mobs/init.lua
View File

@ -592,7 +592,12 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
--minetest.log("min light: " .. mob_light_lvl[1]) --minetest.log("min light: " .. mob_light_lvl[1])
--minetest.log("max light: " .. mob_light_lvl[2]) --minetest.log("max light: " .. mob_light_lvl[2])
mcl_mobspawners.setup_spawner(pointed_thing.under, itemstack:get_name(), mob_light_lvl[1], mob_light_lvl[2]) -- Handle egg conversion
local mob_name = itemstack:get_name()
local convert_to = (minetest.registered_entities[mob_name] or {})._convert_to
if convert_to then mob_name = convert_to end
mcl_mobspawners.setup_spawner(pointed_thing.under, mob_name, mob_light_lvl[1], mob_light_lvl[2])
if not minetest.is_creative_enabled(name) then if not minetest.is_creative_enabled(name) then
itemstack:take_item() itemstack:take_item()
end end

2
mods/ITEMS/mcl_mobspawners/init.lua
View File

@ -135,7 +135,6 @@ function mcl_mobspawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInAr
end end
set_doll_properties(doll, Mob) set_doll_properties(doll, Mob)
-- Start spawning very soon -- Start spawning very soon
local t = minetest.get_node_timer(pos) local t = minetest.get_node_timer(pos)
t:start(2) t:start(2)
@ -172,7 +171,6 @@ local function spawn_mobs(pos, elapsed)
local count = 0 local count = 0
local ent local ent
local timer = minetest.get_node_timer(pos) local timer = minetest.get_node_timer(pos)
-- spawn mob if player detected and in range -- spawn mob if player detected and in range