Merge remote-tracking branch 'origin/master' into testing

This commit is contained in:
kay27 2021-12-05 04:31:17 +04:00
commit 3268a94b20
4 changed files with 16 additions and 12 deletions

View File

@ -821,8 +821,7 @@ function mobs.mob_step(self, dtime)
self.lifetimer = self.lifetimer - dtime
if self.lifetimer <= 0 then
self.lifetimer = self.lifetimer_reset
if not mobs.check_for_player_within_area(self, 64) then
--print("removing in MAIN LOGIC!")
if mobs.can_despawn(self) then
self.object:remove()
return
end

View File

@ -123,6 +123,9 @@ mobs.death_logic = function(self, dtime)
item_drop(self,false,1)
mobs.death_effect(self)
mcl_experience.throw_experience(self.object:get_pos(), math_random(self.xp_min, self.xp_max))
if self.on_die then
self.on_die(self, self.object:get_pos())
end
self.object:remove()
return
end

View File

@ -5,17 +5,19 @@ local minetest_settings = minetest.settings
-- CMI support check
local use_cmi = minetest.global_exists("cmi")
mobs.can_despawn = function(self)
return (not self.tamed and not self.bred and not self.nametag and
not mobs.check_for_player_within_area(self, 64));
end
-- get entity staticdata
mobs.mob_staticdata = function(self)
--despawn mechanism
--don't despawned tamed or bred mobs
if not self.tamed and not self.bred then
if not mobs.check_for_player_within_area(self, 64) then
--print("removing SERIALIZED!")
if mobs.can_despawn(self) then
self.object:remove()
return
end
end
self.remove_ok = true
self.attack = nil

View File

@ -257,7 +257,7 @@ minetest.register_tool("mcl_farming:hoe_diamond", {
hoey = { speed = 8, level = 5, uses = 1562 }
},
_mcl_upgradable = true,
_mcl_upgrade_item = "mcl_tools:hoe_netherite"
_mcl_upgrade_item = "mcl_farming:hoe_netherite"
})
minetest.register_craft({