From 53b0ad734725edf27909a26b93035eee783e666f Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sun, 18 Apr 2021 20:21:11 +0200
Subject: [PATCH] Implement magic damage

---
 mods/CORE/mcl_util/init.lua          | 10 ++++++++++
 mods/ITEMS/mcl_potions/functions.lua | 20 ++++----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua
index 49d1c82a1..741dc604e 100644
--- a/mods/CORE/mcl_util/init.lua
+++ b/mods/CORE/mcl_util/init.lua
@@ -503,6 +503,16 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
 	target:set_hp(target:get_hp() - damage, mt_reason)
 end
 
+function mcl_util.get_hp(obj)
+	local luaentity = obj:get_luaentity()
+
+	if luaentity and luaentity._cmi_is_mob then
+		return luaentity.health
+	else
+		return obj:get_hp()
+	end
+end
+
 function mcl_util.get_inventory(object, create)
 	if object:is_player() then
 		return object:get_inventory()
diff --git a/mods/ITEMS/mcl_potions/functions.lua b/mods/ITEMS/mcl_potions/functions.lua
index 769e5f5b9..9f0c88782 100644
--- a/mods/ITEMS/mcl_potions/functions.lua
+++ b/mods/ITEMS/mcl_potions/functions.lua
@@ -132,17 +132,10 @@ minetest.register_globalstep(function(dtime)
 		if player:get_pos() then mcl_potions._add_spawner(player, "#225533") end
 
 		if EF.poisoned[player].hit_timer >= EF.poisoned[player].step then
-
-			if entity and entity._cmi_is_mob then
-				entity.health = math.max(entity.health - 1, 1)
-				EF.poisoned[player].hit_timer = 0
-			elseif is_player then
-				player:set_hp( math.max(player:get_hp() - 1, 1), { type = "punch", other = "poison"})
-				EF.poisoned[player].hit_timer = 0
-			else -- if not player or mob then remove
-				EF.poisoned[player] = nil
+			if mcl_util.get_hp(player) - 1 > 0 then
+				mcl_util.deal_damage(player, 1, {type = "magic"})
 			end
-
+			EF.poisoned[player].hit_timer = 0
 		end
 
 		if EF.poisoned[player] and EF.poisoned[player].timer >= EF.poisoned[player].dur then
@@ -721,12 +714,7 @@ function mcl_potions.healing_func(player, hp)
 			hp = -1
 		end
 
-		if obj and obj._cmi_is_mob then
-			obj.health = obj.health + hp
-		elseif player:is_player() then
-			player:set_hp(player:get_hp() + hp, { type = "punch", other = "harming" })
-		end
-
+		mcl_util.deal_damage(obj, -hp, {type = "magic"})
 	end
 
 end