Merge pull request 'Iron golem fixes' (#3309) from gldrk/MineClone2:master into master

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3309
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>

mods/ENTITIES/mcl_mobs/combat.lua

@@ -746,7 +746,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 
 	local name = hitter:get_player_name() or ""
 
-	-- attack puncher and call other mobs for help
+	-- attack puncher
 	if self.passive == false
 	and self.state ~= "flop"
 	and (self.child == false or self.type == "monster")
@@ -758,6 +758,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 			self:do_attack(hitter)
 			self._aggro= true
 		end
+	end
 
 	-- alert others to the attack
 	local objs = minetest.get_objects_inside_radius(hitter:get_pos(), self.view_range)
@@ -776,7 +777,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 					obj:do_attack(hitter)
 				elseif type(obj.group_attack) == "table" then
 					for i=1, #obj.group_attack do
-							if obj.name == obj.group_attack[i] then
+						if obj.group_attack[i] == self.name then
 							obj._aggro = true
 							obj:do_attack(hitter)
 							break
@@ -792,7 +793,6 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 		end
 	end
 end
-end
 
 function mob_class:check_aggro(dtime)
 	if not self._aggro or not self.attack then return end

mods/ENTITIES/mobs_mc/iron_golem.lua

@@ -15,7 +15,7 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", {
 	description = S("Iron Golem"),
 	type = "npc",
 	spawn_class = "passive",
-	passive = true,
+	passive = false,
 	hp_min = 100,
 	hp_max = 100,
 	breath_max = -1,
@@ -42,7 +42,7 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", {
 	damage = 14,
 	knock_back = false,
 	reach = 3,
-	group_attack = true,
+	group_attack = { "mobs_mc:villager" },
 	attacks_monsters = true,
 	attack_type = "dogfight",
 	_got_poppy = false,