don't tame baby animals yet
This commit is contained in:
parent
682b61ad4a
commit
a6eae1e95e
|
@ -4371,9 +4371,9 @@ function mcl_mobs:feed_tame(self, clicker, feed_count, breed, tame, notake)
|
||||||
|
|
||||||
-- feed and tame
|
-- feed and tame
|
||||||
|
|
||||||
if tame then
|
if tame and not self.child then
|
||||||
self.tamed = true
|
|
||||||
if not self.owner or self.owner == "" then
|
if not self.owner or self.owner == "" then
|
||||||
|
self.tamed = true
|
||||||
self.owner = clicker:get_player_name()
|
self.owner = clicker:get_player_name()
|
||||||
consume_food = true
|
consume_food = true
|
||||||
end
|
end
|
||||||
|
@ -4391,8 +4391,17 @@ function mcl_mobs:feed_tame(self, clicker, feed_count, breed, tame, notake)
|
||||||
self.object:set_hp(self.health)
|
self.object:set_hp(self.health)
|
||||||
end
|
end
|
||||||
|
|
||||||
if breed and not self.child and not consume_food
|
-- make children grow quicker
|
||||||
and self.hornytimer == 0 and not self.horny then
|
|
||||||
|
if not consume_food and self.child == true then
|
||||||
|
consume_food = true
|
||||||
|
-- deduct 10% of the time to adulthood
|
||||||
|
self.hornytimer = self.hornytimer + ((CHILD_GROW_TIME - self.hornytimer) * 0.1)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- breed animals
|
||||||
|
|
||||||
|
if breed and not consume_food and self.hornytimer == 0 and not self.horny then
|
||||||
self.food = (self.food or 0) + 1
|
self.food = (self.food or 0) + 1
|
||||||
consume_food = true
|
consume_food = true
|
||||||
if self.food >= feed_count then
|
if self.food >= feed_count then
|
||||||
|
@ -4403,14 +4412,6 @@ function mcl_mobs:feed_tame(self, clicker, feed_count, breed, tame, notake)
|
||||||
|
|
||||||
update_tag(self)
|
update_tag(self)
|
||||||
|
|
||||||
-- make children grow quicker
|
|
||||||
if not consume_food and self.child == true then
|
|
||||||
consume_food = true
|
|
||||||
|
|
||||||
-- deduct 10% of the time to adulthood
|
|
||||||
self.hornytimer = self.hornytimer + ((CHILD_GROW_TIME - self.hornytimer) * 0.1)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- if not in creative then take item if it was used
|
-- if not in creative then take item if it was used
|
||||||
if not minetest.is_creative_enabled(clicker:get_player_name()) and consume_food then
|
if not minetest.is_creative_enabled(clicker:get_player_name()) and consume_food then
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user