nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-05 18:10:26 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server

Browse Source
This commit is contained in:
Ombridride 2015-04-11 17:51:39 +02:00
commit a0f14f35f8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mods/mobs/api.lua
View File

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