From 67043e6e509cb4b14c2ee5d3e67b2f6ca38fbb40 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Sat, 11 Apr 2015 17:45:47 +0200 Subject: [PATCH] Reverted commit 8fbd084 --- mods/mobs/api.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index 53713f6a..61804991 100755 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -171,7 +171,7 @@ function mobs:register_mob(name, def) end self.lifetimer = self.lifetimer - dtime - if self.lifetimer <= 0 and not self.tamed then + if self.lifetimer <= 0 and not self.tamed and self.type ~= "npc" 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,7 +798,6 @@ function mobs:register_mob(name, def) obj:setvelocity(vec) end end - end, on_activate = function(self, staticdata, dtime_s) @@ -812,7 +811,9 @@ function mobs:register_mob(name, def) if self.type == "monster" and peaceful_only then self.object:remove() end - self.lifetimer = 600 - dtime_s + if self.type ~= "npc" then + self.lifetimer = 600 - dtime_s + end if staticdata then local tmp = minetest.deserialize(staticdata) if tmp then @@ -852,7 +853,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 then + if self.lifetimer <= 0 and not self.tamed and self.type ~= "npc" then self.object:remove() end end,