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>

mods/ENTITIES/mobs_mc/llama.lua

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

mods/ENTITIES/mobs_mc/parrot.lua

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