From 6907f7cc4f1c887644fe7e686900c2a13a53e22e Mon Sep 17 00:00:00 2001
From: Johannes Fritz <mr.rar1998@gmail.com>
Date: Fri, 10 Feb 2023 13:32:25 -0600
Subject: [PATCH] Fix third party mobs getting no damage from deal_damage

---
 mods/CORE/mcl_util/init.lua | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua
index 89ed4accf..54df7a1de 100644
--- a/mods/CORE/mcl_util/init.lua
+++ b/mods/CORE/mcl_util/init.lua
@@ -545,26 +545,16 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
 	if luaentity then
 		if luaentity.deal_damage then
 			luaentity:deal_damage(damage, mcl_reason or {type = "generic"})
-			return
-		elseif luaentity.is_mob then
-			-- local puncher = mcl_reason and mcl_reason.direct or target
-			-- target:punch(puncher, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy = damage}}, vector.direction(puncher:get_pos(), target:get_pos()), damage)
-			if luaentity.health > 0 then
-				luaentity.health = luaentity.health - damage
-			end
-			return
+		else
+			local puncher = mcl_reason and mcl_reason.direct or target
+			target:punch(puncher, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy = damage}}, vector.direction(puncher:get_pos(), target:get_pos()), damage)
 		end
-	end
+	else -- Player
+		local hp = target:get_hp()
 
-	local is_immortal = target:get_armor_groups().immortal or 0
-	if is_immortal>0 then
-		return
-	end
-
-	local hp = target:get_hp()
-
-	if hp > 0 then
-		target:set_hp(hp - damage, {_mcl_reason = mcl_reason})
+		if hp > 0 then
+			target:set_hp(hp - damage, {_mcl_reason = mcl_reason})
+		end
 	end
 end