Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Fix Parrots and Llamas attacking iron golems' (#2616) from fix_parrot_llama_golem_attacks into master 

Reviewed-on: MineClone2/MineClone2#2616
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
This commit is contained in:
cora 2022-09-09 20:26:39 +00:00
parent 9b07f3cffb cac64f034d
commit 6262bda3f2
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/ENTITIES/mobs_mc/llama.lua
View File

@ -231,10 +231,6 @@ mcl_mobs:register_arrow("mobs_mc:llamaspit", {
end, end,
hit_mob = function(self, mob) hit_mob = function(self, mob)
mob:punch(self.object, 1.0, {
full_punch_interval = 1.0,
damage_groups = {fleshy = 1},
}, nil)
end, end,
hit_node = function(self, pos, node) hit_node = function(self, pos, node)

3
mods/ENTITIES/mobs_mc/parrot.lua
View File

@ -127,8 +127,9 @@ end
mcl_mobs:register_mob("mobs_mc:parrot", { mcl_mobs:register_mob("mobs_mc:parrot", {
description = S("Parrot"), description = S("Parrot"),
type = "passive", type = "animal",
spawn_class = "passive", spawn_class = "passive",
passive = true,
pathfinding = 1, pathfinding = 1,
hp_min = 6, hp_min = 6,
hp_max = 6, hp_max = 6,