mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-11-24 20:03:45 +01:00
don't hurt perched parrot on punch
This commit is contained in:
parent
e90e17e533
commit
c0a9cb7020
@ -153,26 +153,20 @@ mcl_mobs:register_mob("mobs_mc:parrot", {
|
|||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Feed to tame, but not breed
|
-- Feed to tame, but not breed
|
||||||
if mobs:feed_tame(self, clicker, 1, false, true) then return end
|
if mobs:feed_tame(self, clicker, 1, false, true) then return end
|
||||||
perch(self,clicker)
|
perch(self,clicker)
|
||||||
end,
|
end,
|
||||||
do_custom = function(self,dtime)
|
do_custom = function(self,dtime)
|
||||||
check_perch(self,dtime)
|
check_perch(self,dtime)
|
||||||
|
end,
|
||||||
|
do_punch = function(self,puncher) --do_punch is the mcl_mobs_redo variant - it gets called by on_punch later....
|
||||||
|
if self.object:get_attach() == puncher then
|
||||||
|
return false --return false explicitly here. mcl_mobs checks for that
|
||||||
end
|
end
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_on_leaveplayer(function(p)
|
|
||||||
for _,o in pairs(p:get_children()) do
|
|
||||||
local l = o:get_luaentity()
|
|
||||||
if l and l.name == "mobs_mc:parrot" then
|
|
||||||
l.object:set_detach()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
|
|
||||||
-- Parrots spawn rarely in jungles. TODO: Also check for jungle *biome* <- I'll get to this eventually -j4i
|
-- Parrots spawn rarely in jungles. TODO: Also check for jungle *biome* <- I'll get to this eventually -j4i
|
||||||
mcl_mobs:spawn_specific(
|
mcl_mobs:spawn_specific(
|
||||||
"mobs_mc:parrot",
|
"mobs_mc:parrot",
|
||||||
|
Loading…
Reference in New Issue
Block a user