1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-18 16:20:38 +01:00

Removed inhibition of lifetimer system about npcs

- NPCs have now a 600sec (10min) lifetime
This commit is contained in:
LeMagnesium 2015-04-11 15:41:57 +02:00
parent 89893df9ba
commit 8fbd084624

View File

@ -171,7 +171,7 @@ function mobs:register_mob(name, def)
end
self.lifetimer = self.lifetimer - dtime
if self.lifetimer <= 0 and not self.tamed and self.type ~= "npc" then
if self.lifetimer <= 0 and not self.tamed then
local player_count = 0
for _,obj in ipairs(minetest.get_objects_inside_radius(self.object:getpos(), 10)) do
if obj:is_player() then
@ -798,6 +798,7 @@ function mobs:register_mob(name, def)
obj:setvelocity(vec)
end
end
end,
on_activate = function(self, staticdata, dtime_s)
@ -811,9 +812,7 @@ function mobs:register_mob(name, def)
if self.type == "monster" and peaceful_only then
self.object:remove()
end
if self.type ~= "npc" then
self.lifetimer = 600 - dtime_s
end
if staticdata then
local tmp = minetest.deserialize(staticdata)
if tmp then
@ -853,7 +852,7 @@ function mobs:register_mob(name, def)
if self.type == "monster" and self.tamed == true then
self.type = "npc"
end
if self.lifetimer <= 0 and not self.tamed and self.type ~= "npc" then
if self.lifetimer <= 0 and not self.tamed then
self.object:remove()
end
end,