From 1ebe4d44f6bab030573f9b2f017c4cb5bd3b82b8 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 8 Aug 2021 15:07:10 +0200 Subject: [PATCH] Fix sheep getting horny from eating grass --- mods/mobs/api.lua | 40 +++++++++++++++++++++------------------- mods/mobs/mob_sheep.lua | 2 +- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index b7e551c..6e0c3ac 100644 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -1722,7 +1722,7 @@ end -- Feeding, taming and breeding (thanks blert2112) -function mobs:feed_tame(self, clicker, feed_count, breed) +function mobs:feed_tame(self, clicker, feed_count, breed, effect) -- Feed a mob(mostly a wrapper to handle self.check_fed) local item = nil @@ -1747,25 +1747,27 @@ function mobs:feed_tame(self, clicker, feed_count, breed) clicker:set_wielded_item(item) end end - mob_sound(self, self.sounds.eat, true) - local mobpos = self.object:get_pos() - minetest.add_particlespawner( - { - amount = 10, - time = 0.1, - minpos = {x = mobpos.x - 0.1, y = mobpos.y - 0.1, z = mobpos.z - 0.1}, - maxpos = {x = mobpos.x + 0.1, y = mobpos.y + 0.1, z = mobpos.z + 0.1}, - minvel = {x = -1, y = -1, z = -1}, - maxvel = {x = 1, y = 0, z = 1}, - minacc = {x = 0, y = 6, z = 0}, - maxacc = {x = 0, y = 1, z = 0}, - minexptime = 0.5, - maxexptime = 1, - minsize = 0.5, - maxsize = 2, - texture = "magicpuff.png" - }) + if effect ~= false then + mob_sound(self, self.sounds.eat, true) + local mobpos = self.object:get_pos() + minetest.add_particlespawner( + { + amount = 10, + time = 0.1, + minpos = {x = mobpos.x - 0.1, y = mobpos.y - 0.1, z = mobpos.z - 0.1}, + maxpos = {x = mobpos.x + 0.1, y = mobpos.y + 0.1, z = mobpos.z + 0.1}, + minvel = {x = -1, y = -1, z = -1}, + maxvel = {x = 1, y = 0, z = 1}, + minacc = {x = 0, y = 6, z = 0}, + maxacc = {x = 0, y = 1, z = 0}, + minexptime = 0.5, + maxexptime = 1, + minsize = 0.5, + maxsize = 2, + texture = "magicpuff.png" + }) + end self:check_fed(name, feed_count, breed) diff --git a/mods/mobs/mob_sheep.lua b/mods/mobs/mob_sheep.lua index 4f9fe53..aeebfcb 100644 --- a/mods/mobs/mob_sheep.lua +++ b/mods/mobs/mob_sheep.lua @@ -65,7 +65,7 @@ mobs:register_mob( on_replace = function(self, pos) minetest.set_node(pos, {name = self.replace_with}) - if mobs:feed_tame(self, self.follow, 8, true) then + if mobs:feed_tame(self, self.follow, 8, false, false) then if self.gotten == false then self.object:set_properties( {